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.
Link: https://lore.kernel.org/20250729142019.2718195-1-sashal@kernel.org [1]
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