Received-SPF: pass (google.com: domain of linux-kernel+bounces-1250-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Matthieu Baerts <matttbe@kernel.org>
Subject: [PATCH net 0/4] mptcp: misc. fixes for v6.7
Date: Fri, 15 Dec 2023 17:04:23 +0100
Message-Id: <20231215-upstream-net-20231215-mptcp-misc-fixes-v1-0-91d20266d525@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>, 
 "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, 
 Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, 
 Shuah Khan <shuah@kernel.org>, 
 Benjamin Hesmans <benjamin.hesmans@tessares.net>, 
 Dmytro Shytyi <dmytro@shytyi.net>
Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, 
 linux-kernel@vger.kernel.org, Matthieu Baerts <matttbe@kernel.org>, 
 Geliang Tang <geliang.tang@linux.dev>, stable@vger.kernel.org, 
 syzbot+c53d4d3ddb327e80bc51@syzkaller.appspotmail.com

Here are a few fixes related to MPTCP:

Patch 1 avoids skipping some subtests of the MPTCP Join selftest by
mistake when using older versions of GCC. This fixes a patch introduced
in v6.4, backported up to v6.1.

Patch 2 fixes an inconsistent state when using MPTCP + FastOpen. A fix
for v6.2.

Patch 3 adds a description for MPTCP Kunit test modules to avoid a
warning.

Patch 4 adds an entry to the mailmap file for Geliang's email addresses.

Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
---
Geliang Tang (2):
      selftests: mptcp: join: fix subflow_send_ack lookup
      mailmap: add entries for Geliang Tang

Matthieu Baerts (1):
      mptcp: fill in missing MODULE_DESCRIPTION()

Paolo Abeni (1):
      mptcp: fix inconsistent state on fastopen race

 .mailmap                                        |  4 ++++
 net/mptcp/crypto_test.c                         |  1 +
 net/mptcp/protocol.c                            |  6 +++---
 net/mptcp/protocol.h                            |  9 +++++---
 net/mptcp/subflow.c                             | 28 +++++++++++++++----------
 net/mptcp/token_test.c                          |  1 +
 tools/testing/selftests/net/mptcp/mptcp_join.sh |  8 +++----
 7 files changed, 36 insertions(+), 21 deletions(-)
---
base-commit: 64b8bc7d5f1434c636a40bdcfcd42b278d1714be
change-id: 20231215-upstream-net-20231215-mptcp-misc-fixes-33c4380c2f32

Best regards,
-- 
Matthieu Baerts <matttbe@kernel.org>