From 08d046d994287cfe72f9942d8589dc48696ec82e Mon Sep 17 00:00:00 2001 From: Alice Frosi Date: Tue, 12 May 2020 09:08:33 +0200 Subject: [PATCH] kernel: config CONFIG_HAVE_NET_DSA The kernel config CONFIG_HAVE_NET_DSA is not supported on s390x. See https://github.com/torvalds/linux/blob/master/net/dsa/Kconfig#L4. Config moved to arch directory. Signed-off-by: Alice Frosi Signed-off-by: Jakob-Naucke --- tools/packaging/kernel/configs/fragments/arm64/network.conf | 1 + tools/packaging/kernel/configs/fragments/common/network.conf | 1 - tools/packaging/kernel/configs/fragments/x86_64/network.conf | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 tools/packaging/kernel/configs/fragments/arm64/network.conf create mode 100644 tools/packaging/kernel/configs/fragments/x86_64/network.conf diff --git a/tools/packaging/kernel/configs/fragments/arm64/network.conf b/tools/packaging/kernel/configs/fragments/arm64/network.conf new file mode 100644 index 0000000000..4cd43867d5 --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/arm64/network.conf @@ -0,0 +1 @@ +CONFIG_HAVE_NET_DSA=y diff --git a/tools/packaging/kernel/configs/fragments/common/network.conf b/tools/packaging/kernel/configs/fragments/common/network.conf index b8d49ae7c4..7bdc3de7a0 100644 --- a/tools/packaging/kernel/configs/fragments/common/network.conf +++ b/tools/packaging/kernel/configs/fragments/common/network.conf @@ -40,7 +40,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_STP=y CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_HAVE_NET_DSA=y CONFIG_LLC=y CONFIG_NET_SCHED=y CONFIG_NET_SCH_CBQ=y diff --git a/tools/packaging/kernel/configs/fragments/x86_64/network.conf b/tools/packaging/kernel/configs/fragments/x86_64/network.conf new file mode 100644 index 0000000000..4cd43867d5 --- /dev/null +++ b/tools/packaging/kernel/configs/fragments/x86_64/network.conf @@ -0,0 +1 @@ +CONFIG_HAVE_NET_DSA=y