Drop selftests-mptcp-depends-on-built-in-ipv6.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.9/selftests-mptcp-depends-on-built-in-ipv6.patch b/queue-5.9/selftests-mptcp-depends-on-built-in-ipv6.patch
deleted file mode 100644 (file)
index c141a93..0000000
--- a/queue-5.9/selftests-mptcp-depends-on-built-in-ipv6.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From af37324fb1634cb214037ddb33089093a83c8497 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Oct 2020 17:55:49 +0200
-Subject: selftests: mptcp: depends on built-in IPv6
-
-From: Matthieu Baerts <matthieu.baerts@tessares.net>
-
-[ Upstream commit 287d35405989cfe0090e3059f7788dc531879a8d ]
-
-Recently, CONFIG_MPTCP_IPV6 no longer selects CONFIG_IPV6. As a
-consequence, if CONFIG_MPTCP_IPV6=y is added to the kconfig, it will no
-longer ensure CONFIG_IPV6=y. If it is not enabled, CONFIG_MPTCP_IPV6
-will stay disabled and selftests will fail.
-
-We also need CONFIG_IPV6 to be built-in. For more details, please see
-commit 0ed37ac586c0 ("mptcp: depends on IPV6 but not as a module").
-
-Note that 'make kselftest-merge' will take all 'config' files found in
-'tools/testsing/selftests'. Because some of them already set
-CONFIG_IPV6=y, MPTCP selftests were still passing. But they will fail if
-MPTCP selftests are launched manually after having executed this command
-to prepare the kernel config:
-
-  ./scripts/kconfig/merge_config.sh -m .config \
-      ./tools/testing/selftests/net/mptcp/config
-
-Fixes: 010b430d5df5 ("mptcp: MPTCP_IPV6 should depend on IPV6 instead of selecting it")
-Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
-Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
-Link: https://lore.kernel.org/r/20201021155549.933731-1-matthieu.baerts@tessares.net
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/net/mptcp/config | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selftests/net/mptcp/config
-index 8df5cb8f71ff9..741a1c4f4ae8f 100644
---- a/tools/testing/selftests/net/mptcp/config
-+++ b/tools/testing/selftests/net/mptcp/config
-@@ -1,4 +1,5 @@
- CONFIG_MPTCP=y
-+CONFIG_IPV6=y
- CONFIG_MPTCP_IPV6=y
- CONFIG_INET_DIAG=m
- CONFIG_INET_MPTCP_DIAG=m
--- 
-2.25.1
-

diff --git a/queue-5.9/series b/queue-5.9/series
index fad586ef27011ed4f65f615ecbafa64a4b6d3769..d077b76b9d3556f021ce9bba9780e81cdc0ca791 100644 (file)
--- a/queue-5.9/series
+++ b/queue-5.9/series
@@ -578,7 +578,6 @@ netfilter-ebtables-fixes-dropping-of-small-packets-i.patch
 vdpa-mlx5-make-use-of-a-specific-16-bit-endianness-a.patch
 vdpa-mlx5-fix-failure-to-bring-link-up.patch
 vdpa-mlx5-setup-driver-only-if-virtio_config_s_drive.patch
-selftests-mptcp-depends-on-built-in-ipv6.patch
 netfilter-nf_fwd_netdev-clear-timestamp-in-forwardin.patch
 soc-xilinx-fix-error-code-in-zynqmp_pm_probe.patch
 arm64-dts-meson-vim3-correct-led-polarity.patch