Skip to content

mptcp: fix recent failed backports (20251016)

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 Latest2 patches 2 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/2mptcp: pm: in-kernel: usable client side with C-flagnet/mptcp/pm.c net/mptcp/pm_netlink.c net/mptcp/protocol.h+61 -31 reply
2/2selftests: mptcp: join: validate C-flag + def limittools/testing/selftests/net/mptcp/mptcp_join.sh+10 -01 reply

Reviews trailers per patch

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

PatchGeliang Tang
1/2R-b R-b
2/2R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 5.15.y 0/2] mptcp: fix recent failed backports (20251016)

Greg recently reported the following patch could not be applied without conflicts in this tree:

- 4b1ff850e0c1 ("mptcp: pm: in-kernel: usable client side with C-flag")

Note that the following patch got applied, but at the wrong place and requiring additional modifications:

- 008385efd05e ("selftests: mptcp: join: validate C-flag + def limit")

Conflicts have been resolved, and documented in each patch.

Matthieu Baerts (NGI0) (2):
mptcp: pm: in-kernel: usable client side with C-flag
selftests: mptcp: join: validate C-flag + def limit

 net/mptcp/pm.c                                |  7 ++-
 net/mptcp/pm_netlink.c                        | 49 ++++++++++++++++++-
 net/mptcp/protocol.h                          |  8 +++
 .../testing/selftests/net/mptcp/mptcp_join.sh | 10 ++++
 4 files changed, 71 insertions(+), 3 deletions(-)
Signature · 1 line
2.51.0