From 1db5000b09f8a5619d4dd16b5300b64843cce38e Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 28 Oct 2020 18:09:52 -0400 Subject: [PATCH] Drop selftests-mptcp-depends-on-built-in-ipv6.patch Signed-off-by: Sasha Levin --- ...tests-mptcp-depends-on-built-in-ipv6.patch | 49 ------------------- queue-5.9/series | 1 - 2 files changed, 50 deletions(-) delete mode 100644 queue-5.9/selftests-mptcp-depends-on-built-in-ipv6.patch 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 index c141a935016..00000000000 --- 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 -Date: Wed, 21 Oct 2020 17:55:49 +0200 -Subject: selftests: mptcp: depends on built-in IPv6 - -From: Matthieu Baerts - -[ 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 -Reviewed-by: Mat Martineau -Link: https://lore.kernel.org/r/20201021155549.933731-1-matthieu.baerts@tessares.net -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - 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 fad586ef270..d077b76b9d3 100644 --- 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 -- 2.47.3