drop mptcp selftest patch from 5.10 and 5.15

diff --git a/queue-5.10/selftests-mptcp-join-validate-c-flag-def-limit.patch b/queue-5.10/selftests-mptcp-join-validate-c-flag-def-limit.patch
deleted file mode 100644 (file)
index e82d785..0000000
--- a/queue-5.10/selftests-mptcp-join-validate-c-flag-def-limit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 008385efd05e04d8dff299382df2e8be0f91d8a0 Mon Sep 17 00:00:00 2001
-From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
-Date: Thu, 25 Sep 2025 12:32:37 +0200
-Subject: selftests: mptcp: join: validate C-flag + def limit
-
-From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-
-commit 008385efd05e04d8dff299382df2e8be0f91d8a0 upstream.
-
-The previous commit adds an exception for the C-flag case. The
-'mptcp_join.sh' selftest is extended to validate this case.
-
-In this subtest, there is a typical CDN deployment with a client where
-MPTCP endpoints have been 'automatically' configured:
-
-- the server set net.mptcp.allow_join_initial_addr_port=0
-
-- the client has multiple 'subflow' endpoints, and the default limits:
-  not accepting ADD_ADDRs.
-
-Without the parent patch, the client is not able to establish new
-subflows using its 'subflow' endpoints. The parent commit fixes that.
-
-The 'Fixes' tag here below is the same as the one from the previous
-commit: this patch here is not fixing anything wrong in the selftests,
-but it validates the previous fix for an issue introduced by this commit
-ID.
-
-Fixes: df377be38725 ("mptcp: add deny_join_id0 in mptcp_options_received")
-Cc: stable@vger.kernel.org
-Reviewed-by: Geliang Tang <geliang@kernel.org>
-Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Link: https://patch.msgid.link/20250925-net-next-mptcp-c-flag-laminar-v1-2-ad126cc47c6b@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- tools/testing/selftests/net/mptcp/mptcp_join.sh |   11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
-+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-@@ -425,6 +425,17 @@ chk_rm_nr()
-               echo Client ns stats
-               ip netns exec $ns2 nstat -as | grep MPTcp
-       fi
-+
-+      # default limits, server deny join id 0 + signal
-+      if reset_with_allow_join_id0 "default limits, server deny join id 0" 0 1; then
-+              pm_nl_set_limits $ns1 0 2
-+              pm_nl_set_limits $ns2 0 2
-+              pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
-+              pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
-+              pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
-+              run_tests $ns1 $ns2 10.0.1.1
-+              chk_join_nr 2 2 2
-+      fi
- }
- 
- sin=$(mktemp)

diff --git a/queue-5.10/series b/queue-5.10/series
index 5cc570dc1c61630ebba0101afea8cc63382b1956..2c5f19ead5c3d0ced118141dda698f7815cb1934 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -164,7 +164,6 @@ pci-tegra194-fix-broken-tegra_pcie_ep_raise_msi_irq.patch
 spi-cadence-quadspi-flush-posted-register-writes-before-indac-access.patch
 x86-umip-check-that-the-instruction-opcode-is-at-least-two-bytes.patch
 x86-umip-fix-decoding-of-register-forms-of-0f-01-sgdt-and-sidt-aliases.patch
-selftests-mptcp-join-validate-c-flag-def-limit.patch
 nfsd-fix-destination-buffer-size-in-nfsd4_ssc_setup_dul.patch
 nfsd-nfserr_jukebox-in-nlm_fopen-should-lead-to-a-retry.patch
 ext4-increase-i_disksize-to-offset-len-in-ext4_update_disksize_before_punch.patch

diff --git a/queue-5.15/selftests-mptcp-join-validate-c-flag-def-limit.patch b/queue-5.15/selftests-mptcp-join-validate-c-flag-def-limit.patch
deleted file mode 100644 (file)
index 4a8ba6b..0000000
--- a/queue-5.15/selftests-mptcp-join-validate-c-flag-def-limit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 008385efd05e04d8dff299382df2e8be0f91d8a0 Mon Sep 17 00:00:00 2001
-From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
-Date: Thu, 25 Sep 2025 12:32:37 +0200
-Subject: selftests: mptcp: join: validate C-flag + def limit
-
-From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-
-commit 008385efd05e04d8dff299382df2e8be0f91d8a0 upstream.
-
-The previous commit adds an exception for the C-flag case. The
-'mptcp_join.sh' selftest is extended to validate this case.
-
-In this subtest, there is a typical CDN deployment with a client where
-MPTCP endpoints have been 'automatically' configured:
-
-- the server set net.mptcp.allow_join_initial_addr_port=0
-
-- the client has multiple 'subflow' endpoints, and the default limits:
-  not accepting ADD_ADDRs.
-
-Without the parent patch, the client is not able to establish new
-subflows using its 'subflow' endpoints. The parent commit fixes that.
-
-The 'Fixes' tag here below is the same as the one from the previous
-commit: this patch here is not fixing anything wrong in the selftests,
-but it validates the previous fix for an issue introduced by this commit
-ID.
-
-Fixes: df377be38725 ("mptcp: add deny_join_id0 in mptcp_options_received")
-Cc: stable@vger.kernel.org
-Reviewed-by: Geliang Tang <geliang@kernel.org>
-Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Link: https://patch.msgid.link/20250925-net-next-mptcp-c-flag-laminar-v1-2-ad126cc47c6b@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- tools/testing/selftests/net/mptcp/mptcp_join.sh |   11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
-+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
-@@ -1005,6 +1005,17 @@ chk_link_usage()
-       else
-               echo "[ ok ]"
-       fi
-+
-+      # default limits, server deny join id 0 + signal
-+      if reset_with_allow_join_id0 "default limits, server deny join id 0" 0 1; then
-+              pm_nl_set_limits $ns1 0 2
-+              pm_nl_set_limits $ns2 0 2
-+              pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
-+              pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
-+              pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
-+              run_tests $ns1 $ns2 10.0.1.1
-+              chk_join_nr 2 2 2
-+      fi
- }
- 
- subflows_tests()

diff --git a/queue-5.15/series b/queue-5.15/series
index 92306577650b159ea1b082ff484904e5d503db0b..eda73f416ce6fb6c29952e4730f0649051912734 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -213,7 +213,6 @@ spi-cadence-quadspi-flush-posted-register-writes-before-indac-access.patch
 spi-cadence-quadspi-flush-posted-register-writes-before-dac-access.patch
 x86-umip-check-that-the-instruction-opcode-is-at-least-two-bytes.patch
 x86-umip-fix-decoding-of-register-forms-of-0f-01-sgdt-and-sidt-aliases.patch
-selftests-mptcp-join-validate-c-flag-def-limit.patch
 mm-page_alloc-only-set-alloc_highatomic-for-__gpf_high-allocations.patch
 nfsd-fix-destination-buffer-size-in-nfsd4_ssc_setup_dul.patch
 nfsd-nfserr_jukebox-in-nlm_fopen-should-lead-to-a-retry.patch