From: Jakub Kicinski Date: Tue, 11 Jun 2024 02:49:13 +0000 (-0700) Subject: Merge branch 'mptcp-various-fixes' X-Git-Tag: v6.10-rc4~26^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70b3c88cec7eed6080c8c37f0d2cc4bc46c08852;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'mptcp-various-fixes' Matthieu Baerts says: ==================== mptcp: various fixes The different patches here are some unrelated fixes for MPTCP: - Patch 1 ensures 'snd_una' is initialised on connect in case of MPTCP fallback to TCP followed by retransmissions before the processing of any other incoming packets. A fix for v5.9+. - Patch 2 makes sure the RmAddr MIB counter is incremented, and only once per ID, upon the reception of a RM_ADDR. A fix for v5.10+. - Patch 3 doesn't update 'add addr' related counters if the connect() was not possible. A fix for v5.7+. - Patch 4 updates the mailmap file to add Geliang's new email address. ==================== Link: https://lore.kernel.org/r/20240607-upstream-net-20240607-misc-fixes-v1-0-1ab9ddfa3d00@kernel.org Signed-off-by: Jakub Kicinski --- 70b3c88cec7eed6080c8c37f0d2cc4bc46c08852