mptcp: fix recent failed backports (20250728)
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
Patches in v1 Applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | selftests: mptcp: make sendfile selftest worktools/ | +17 | 2 replies | |
| 2/3 | selftests: mptcp: connect: also cover alt modestools/ tools/ tools/ | +12 | 5 replies | |
| 3/3 | selftests: mptcp: connect: also cover checksumtools/ tools/ | +6 | 2 replies |
Reviews trailers per patch
All 3 patches have a Reviewed-by or Acked-by.
| Patch | Mat Martineau | Geliang Tang |
|---|---|---|
| 1/3 | R-b R-b | |
| 2/3 | R-b R-b | |
| 3/3 | R-b R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
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