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. Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx> --- Geliang Tang (1): mailmap: map Geliang's new email address Paolo Abeni (1): mptcp: ensure snd_una is properly initialized on connect YonglongLi (2): mptcp: pm: inc RmAddr MIB counter once per RM_ADDR ID mptcp: pm: update add_addr counters after connect .mailmap | 1 + net/mptcp/pm_netlink.c | 21 ++++++++++++++------- net/mptcp/protocol.c | 1 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++-- 4 files changed, 19 insertions(+), 9 deletions(-) --- base-commit: c44711b78608c98a3e6b49ce91678cd0917d5349 change-id: 20240607-upstream-net-20240607-misc-fixes-024007171d60 Best regards, -- Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>