From: Jakub Kicinski Date: Wed, 3 Jan 2024 00:12:49 +0000 (-0800) Subject: Merge branch 'mptcp-new-reviewer-and-prevent-a-warning' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d5a13915ae2f4df738bf4254ec25e19f82e3ff49;p=linux.git Merge branch 'mptcp-new-reviewer-and-prevent-a-warning' 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 --- d5a13915ae2f4df738bf4254ec25e19f82e3ff49