Skip to content

mptcp: fix recent failed backports (20250728)

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 Latest3 patches 9 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/3selftests: mptcp: make sendfile selftest worktools/testing/selftests/net/mptcp/mptcp_connect.c+17 -92 replies
2/3selftests: mptcp: connect: also cover alt modestools/testing/selftests/net/mptcp/Makefile tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh+12 -15 replies
3/3selftests: mptcp: connect: also cover checksumtools/testing/selftests/net/mptcp/Makefile tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh+6 -12 replies

Reviews trailers per patch

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

PatchMat MartineauGeliang Tang
1/3R-b R-b
2/3R-b R-b
3/3R-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/3] mptcp: fix recent failed backports (20250728)

Greg recently reported 2 patches that could not be applied without conflicts in v5.15:

- 37848a456fc3 ("selftests: mptcp: connect: also cover alt modes")
- fdf0f60a2bb0 ("selftests: mptcp: connect: also cover checksum")

The first one has been resolved by Sasha in [1].

An additional backport was needed to fix issues when running the new sendfile test:

- df9e03aec3b1 ("selftests: mptcp: make sendfile selftest work")

Conflicts have been resolved, and documented in each patch.

Florian Westphal (1):
selftests: mptcp: make sendfile selftest work

Matthieu Baerts (NGI0) (2):
selftests: mptcp: connect: also cover alt modes
selftests: mptcp: connect: also cover checksum

 tools/testing/selftests/net/mptcp/Makefile    |  3 ++-
 .../selftests/net/mptcp/mptcp_connect.c       | 26 ++++++++++++-------
 .../net/mptcp/mptcp_connect_checksum.sh       |  5 ++++
 .../selftests/net/mptcp/mptcp_connect_mmap.sh |  5 ++++
 .../net/mptcp/mptcp_connect_sendfile.sh       |  5 ++++
 5 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_checksum.sh
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_mmap.sh
 create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_sendfile.sh
Signature · 1 line
2.50.0