Merge branch 'mptcp-new-reviewer-and-prevent-a-warning'
authorJakub Kicinski <kuba@kernel.org>
Wed, 3 Jan 2024 00:12:49 +0000 (16:12 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 3 Jan 2024 00:12:49 +0000 (16:12 -0800)
Matthieu Baerts says:

====================
mptcp: new reviewer and prevent a warning

Patch 1 adds MPTCP long time contributor -- Geliang Tang -- as a new
reviewer for the project. Thanks!

Patch 2 prevents a warning when TCP Diag is used to close internal MPTCP
listener subflows. This is a correction for a patch introduced in v6.4
which was fixing an issue from v5.17.
====================

Link: https://lore.kernel.org/r/20231226-upstream-net-20231226-mptcp-prevent-warn-v1-0-1404dcc431ea@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge