From c987571fb4ee2e83cff55cfac7720767c7262fde Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sat, 26 Dec 2020 17:40:04 +0100 Subject: dashboard/config/linux: disable FORCEDETH It's unclear why we have it enabled, seems to be some hardware driver. --- dashboard/config/linux/bits/subsystems.yml | 9 +++++---- dashboard/config/linux/stable-5.4-kasan.config | 3 +-- dashboard/config/linux/upstream-apparmor-kasan.config | 3 +-- dashboard/config/linux/upstream-arm64-kasan.config | 3 +-- dashboard/config/linux/upstream-kcsan.config | 3 +-- dashboard/config/linux/upstream-kmsan.config | 3 +-- dashboard/config/linux/upstream-leak.config | 3 +-- dashboard/config/linux/upstream-riscv64-kasan.config | 3 +-- dashboard/config/linux/upstream-selinux-kasan.config | 3 +-- dashboard/config/linux/upstream-smack-kasan.config | 3 +-- 10 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml index 9d0c8eade..844577dd2 100644 --- a/dashboard/config/linux/bits/subsystems.yml +++ b/dashboard/config/linux/bits/subsystems.yml @@ -799,6 +799,10 @@ config: - NET_VRF - VSOCKMON - ATM_TCP + - E100 + - E1000E + - NET_VENDOR_GOOGLE + - GVE - NET_VENDOR_3COM: n - NET_VENDOR_ADAPTEC: n - NET_VENDOR_AGERE: n @@ -819,10 +823,7 @@ config: - NET_VENDOR_EMULEX: n - NET_VENDOR_EZCHIP: n - NET_VENDOR_FUJITSU: n - - GVE - NET_VENDOR_HUAWEI: n - - E100 - - E1000E - NET_VENDOR_MARVELL: n - NET_VENDOR_MICREL: n - NET_VENDOR_MICROCHIP: n @@ -832,7 +833,7 @@ config: - NET_VENDOR_NETERION: n - NET_VENDOR_NETRONOME: n - NET_VENDOR_NI: n - - FORCEDETH + - NET_VENDOR_NVIDIA: n - NET_VENDOR_OKI: n - NET_VENDOR_PACKET_ENGINES: n - NET_VENDOR_PENSANDO: n diff --git a/dashboard/config/linux/stable-5.4-kasan.config b/dashboard/config/linux/stable-5.4-kasan.config index 3442c304b..008534299 100644 --- a/dashboard/config/linux/stable-5.4-kasan.config +++ b/dashboard/config/linux/stable-5.4-kasan.config @@ -2747,8 +2747,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config index ed3fc6d72..7da5a74b6 100644 --- a/dashboard/config/linux/upstream-apparmor-kasan.config +++ b/dashboard/config/linux/upstream-apparmor-kasan.config @@ -2803,8 +2803,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-arm64-kasan.config b/dashboard/config/linux/upstream-arm64-kasan.config index 6a4ce2a5f..d1e80a8fb 100644 --- a/dashboard/config/linux/upstream-arm64-kasan.config +++ b/dashboard/config/linux/upstream-arm64-kasan.config @@ -2841,8 +2841,7 @@ CONFIG_MLX5_SW_STEERING=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config index 9114b05d2..4c3097f30 100644 --- a/dashboard/config/linux/upstream-kcsan.config +++ b/dashboard/config/linux/upstream-kcsan.config @@ -2804,8 +2804,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config index 67742171f..c52ee2c3a 100644 --- a/dashboard/config/linux/upstream-kmsan.config +++ b/dashboard/config/linux/upstream-kmsan.config @@ -2672,8 +2672,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config index afef34b2d..e7a04edad 100644 --- a/dashboard/config/linux/upstream-leak.config +++ b/dashboard/config/linux/upstream-leak.config @@ -2803,8 +2803,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-riscv64-kasan.config b/dashboard/config/linux/upstream-riscv64-kasan.config index 692777fc3..5e31fff5d 100644 --- a/dashboard/config/linux/upstream-riscv64-kasan.config +++ b/dashboard/config/linux/upstream-riscv64-kasan.config @@ -2335,8 +2335,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config index c3e011e1d..f17eee97d 100644 --- a/dashboard/config/linux/upstream-selinux-kasan.config +++ b/dashboard/config/linux/upstream-selinux-kasan.config @@ -2799,8 +2799,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config index c6eaf4db3..dfe11da46 100644 --- a/dashboard/config/linux/upstream-smack-kasan.config +++ b/dashboard/config/linux/upstream-smack-kasan.config @@ -2803,8 +2803,7 @@ CONFIG_MLX4_CORE=y # CONFIG_NET_VENDOR_NETERION is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NI is not set -CONFIG_NET_VENDOR_NVIDIA=y -CONFIG_FORCEDETH=y +# CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_PACKET_ENGINES is not set -- cgit mrf-deployment