Skip to content

mptcp: fix recent failed backports (20260211)

Matthieu Baerts (NGI0) mptcp stable 1 version Applied

Status from this message: This is a note to let you know that I've just added the patch titled

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 6 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/6selftests: mptcp: pm: ensure unknown flags are ignoredtools/testing/selftests/net/mptcp/pm_netlink.sh tools/testing/selftests/net/mptcp/pm_nl_ctl.c+15 -01 reply
2/6mptcp: schedule rtx timer only after pushing datanet/mptcp/protocol.c+9 -61 reply
3/6mptcp: ensure context reset on disconnect()net/mptcp/protocol.c net/mptcp/protocol.h+8 -41 reply
4/6selftests: mptcp: check no dup close events after errortools/testing/selftests/net/mptcp/mptcp_join.sh+79 -01 reply
5/6selftests: mptcp: check subflow errors in close eventstools/testing/selftests/net/mptcp/mptcp_join.sh+22 -31 reply
6/6selftests: mptcp: join: fix local endp not being trackedtools/testing/selftests/net/mptcp/mptcp_join.sh+4 -51 reply

Reviews trailers per patch

All 6 patches have a Reviewed-by or Acked-by.

PatchMat MartineauMatthieu Baerts (NGI0)Geliang Tang
1/6R-b R-b
2/6R-b R-b
3/6R-b R-b
4/6R-b R-b
5/6R-b R-b
6/6R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 6.1.y 0/6] mptcp: fix recent failed backports (20260211)

The following patches could not be applied without conflicts in this tree:

- 29f4801e9c8d ("selftests: mptcp: pm: ensure unknown flags are ignored")
- 2ea6190f42d0 ("mptcp: schedule rtx timer only after pushing data")
- 86730ac255b0 ("mptcp: ensure context reset on disconnect()")
- 8467458dfa61 ("selftests: mptcp: check no dup close events after error")
- 2ef9e3a3845d ("selftests: mptcp: check subflow errors in close events")
- c5d5ecf21fdd ("selftests: mptcp: join: fix local endp not being tracked")

Conflicts have been resolved, and documented in each patch.

(Note: sorry for the delay, but I was unavailable for a few weeks.)

Matthieu Baerts (NGI0) (4):
selftests: mptcp: pm: ensure unknown flags are ignored
selftests: mptcp: check no dup close events after error
selftests: mptcp: check subflow errors in close events
selftests: mptcp: join: fix local endp not being tracked

Paolo Abeni (2):
mptcp: schedule rtx timer only after pushing data
mptcp: ensure context reset on disconnect()

 net/mptcp/protocol.c                          |  24 ++--
 net/mptcp/protocol.h                          |   3 +-
 .../testing/selftests/net/mptcp/mptcp_join.sh | 111 ++++++++++++++++--
 .../testing/selftests/net/mptcp/pm_netlink.sh |   4 +
 tools/testing/selftests/net/mptcp/pm_nl_ctl.c |  11 ++
 5 files changed, 136 insertions(+), 17 deletions(-)
Signature · 1 line
2.51.0