From: David S. Miller <davem@davemloft.net>
Date: Sun, 17 Dec 2023 20:54:22 +0000 (+0000)
Subject: Merge branch 'mptcp-misc-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=979e90173af8d2f52f671d988189aab98c6d1be6;p=linux.git

Merge branch 'mptcp-misc-fixes'

Matthieu Baerts says:

====================
mptcp: misc. fixes for v6.7

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: David S. Miller <davem@davemloft.net>
Signed-off-by: Matthieu Baerts <matttbe@kernel.org>
---

979e90173af8d2f52f671d988189aab98c6d1be6