Drop selftests-drv-net-add-missing-kconfig-for-psp.py.patch

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

diff --git a/queue-7.1/selftests-drv-net-add-missing-kconfig-for-psp.py.patch b/queue-7.1/selftests-drv-net-add-missing-kconfig-for-psp.py.patch
deleted file mode 100644 (file)
index b26dda0..0000000
--- a/queue-7.1/selftests-drv-net-add-missing-kconfig-for-psp.py.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bb99fccf64f1018c04bc17e260cf85e0d40741a8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 10 Jul 2026 20:04:46 +0200
-Subject: selftests: drv-net: add missing kconfig for psp.py
-
-From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-
-[ Upstream commit c25dd7439f84cf607e13d6de8cc1c79cd51f56ff ]
-
-This psp.py selftest was failing on my side when only using the
-drivers/net config file on top of the default one -- the recommended way
-to execute selftest targets.
-
-It looks like some kernel config are needed to execute the new tc
-commands.
-
-Note that this was not visible on NIPA, because these tests are executed
-with the drivers/net/hw ones, combining the two config files, and the hw
-one contains the missing ones.
-
-Fixes: 3f74d5bb807e ("selftests/net: Add env for container based tests")
-Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
-Reviewed-by: Wei Wang <weibunny@fb.com>
-Link: https://patch.msgid.link/20260710-net-sft-fix-containers-v1-6-a2915c294ef5@kernel.org
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- tools/testing/selftests/drivers/net/config | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/testing/selftests/drivers/net/config b/tools/testing/selftests/drivers/net/config
-index 617de8aaf55100..d08955b133b3ee 100644
---- a/tools/testing/selftests/drivers/net/config
-+++ b/tools/testing/selftests/drivers/net/config
-@@ -4,12 +4,15 @@ CONFIG_DEBUG_INFO_BTF_MODULES=n
- CONFIG_INET_PSP=y
- CONFIG_IPV6=y
- CONFIG_MACSEC=m
-+CONFIG_NET_CLS_ACT=y
-+CONFIG_NET_CLS_BPF=y
- CONFIG_NETCONSOLE=m
- CONFIG_NETCONSOLE_DYNAMIC=y
- CONFIG_NETCONSOLE_EXTENDED_LOG=y
- CONFIG_NETDEVSIM=m
- CONFIG_NET_SCH_ETF=m
- CONFIG_NET_SCH_FQ=m
-+CONFIG_NET_SCH_INGRESS=y
- CONFIG_PPP=y
- CONFIG_PPPOE=y
- CONFIG_VLAN_8021Q=m
--- 
-2.53.0
-

diff --git a/queue-7.1/series b/queue-7.1/series
index 03d83b2d0b530496d8b4f740229a06742cb38337..7434a5e2c214297f34843f08c1c7a8710501e61d 100644 (file)
--- a/queue-7.1/series
+++ b/queue-7.1/series
@@ -281,7 +281,6 @@ selftests-ovpn-increase-timeout.patch
 selftests-drv-net-increase-timeout.patch
 selftests-drv-net-convert-so_txtime-to-drv-net.patch
 selftests-net-test-pppoe-packets-in-gro.sh.patch
-selftests-drv-net-add-missing-kconfig-for-psp.py.patch
 gtp-check-skb_pull_data-return-in-gtp1u_send_echo_re.patch
 nexthop-initialize-extack-in-nh_res_bucket_migrate.patch
 tipc-fix-infinite-loop-in-__tipc_nl_compat_dumpit.patch