UBUNTU: [Config] Enable CONFIG_NET_SWITCHDEV in kernel config for s390x starting...

BugLink: https://bugs.launchpad.net/bugs/1865452
This is a request to enable the kernel CONFIG option
CONFIG_NET_SWITCHDEV for s390x starting with focal. On all other
platforms (except s390x) CONFIG_NET_SWITCHDEV is enabled since
16.10 (LP 1628241). The NET_SWITCHDEV support is now required to
enable ConnectX-5 network adapters on s390x, used in "embedded
switch" mode. The s390/net side of the world, will have a need
for NET_SWITCHDEV as well in the near future.

Signed-off-by: Frank Heimes <frank.heimes@canonical.com>
[ saf: updateconfigs to move CONFIG_NET_SWITCHDEV to
  config.common.ubuntu ]
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 03886065e32beb50db3c6d1aaa0943a7237cae8f..6d6553358fb2409a89b996d9f36def5fc99292fd 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -357,7 +357,6 @@ CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_NAND_ECC_SW_HAMMING=m
 CONFIG_MTD_RAW_NAND=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index bec875bb7182a9d04f9c9aea6e92c41a62c09863..0a456a7b453232b52a4a12777fd32e79dfb2eb0a 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -11825,7 +11825,7 @@ CONFIG_INET_ESP_OFFLOAD                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_INET_IPCOMP                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_TCP_MD5SIG                               policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NETLABEL                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_NET_SWITCHDEV                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'n'}>
+CONFIG_NET_SWITCHDEV                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NET_L3_MASTER_DEV                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NET_NCSI                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NCSI_OEM_CMD_GET_MAC                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -11833,6 +11833,7 @@ CONFIG_BPF_STREAM_PARSER                        policy<{'amd64': 'y', 'arm64': '
 #
 CONFIG_SYN_COOKIES                              mark<ENFORCED>
 CONFIG_NET_SWITCHDEV                            mark<ENFORCED> note<LP: #1628241, updated to 'y' for 4.11-rc3 except for s390x>
+CONFIG_NET_SWITCHDEV                            mark<ENFORCED> note<LP: #1865452, updated to 'y' for s390x starting with focal>
 
 # Menu: Networking support >> Networking options >> TCP/IP networking >> BPF based packet filtering framework (BPFILTER)
 CONFIG_BPFILTER                                 policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 4dfcda464d0460c1e43d26c391f5196a0ce9ef45..13a168113e348a3c05f6ba5b255e6fc31d9b3cd0 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -376,7 +376,6 @@ CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_PHYSMAP_GEMINI=y
 CONFIG_MTD_PHYSMAP_VERSATILE=y
 CONFIG_MTD_RAW_NAND=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 21d7c43f72f0336ece342a14c6fea582aa9a08cf..188c7bd1b4873d32a0aabfe1ef53b5bc24f8cdb1 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -359,7 +359,6 @@ CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_PHYSMAP_GEMINI=y
 CONFIG_MTD_PHYSMAP_VERSATILE=y
 CONFIG_MTD_RAW_NAND=y
-CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8b928b46401fb9f8522933e1c83012835db699e6..53d96ce4d6aeee05581bc1f7716a8772ce3a7212 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3858,7 +3858,6 @@ CONFIG_HDMI=y
 CONFIG_HDMI_LPE_AUDIO=m
 CONFIG_HDQ_MASTER_OMAP=m
 # CONFIG_HEADERS_INSTALL is not set
-# CONFIG_HEADER_TEST is not set
 CONFIG_HERMES=m
 CONFIG_HERMES_CACHE_FW_ON_INIT=y
 # CONFIG_HERMES_PRISM is not set
@@ -6377,6 +6376,7 @@ CONFIG_NET_SCH_TAPRIO=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_TC_SKB_EXT=y
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 31e7d91e14270484a66cf9de72375dcb52031fbb..6ade904ada47bc6759e3fe81a499e12706fcb475 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -351,7 +351,6 @@ CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_NAND_CORE=m
 CONFIG_MTD_NAND_ECC_SW_HAMMING=m
 CONFIG_MTD_RAW_NAND=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 956ab01a7d4074bf29cb91ae39ff12b3e12b46db..a80e8ee9a514edb84ee4b18162bd1b35a4ba9355 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -360,7 +360,6 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_PHYSMAP_GEMINI is not set
 # CONFIG_MTD_PHYSMAP_VERSATILE is not set
 CONFIG_MTD_RAW_NAND=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_3COM=y
 CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_NET_VENDOR_AGERE=y

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index ed573d6be55819e26bf9af3d485172b3205a07df..7c43c445e0c2fda279d48d2ade66a3f81d61cf17 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -331,7 +331,6 @@ CONFIG_MFD_CORE=m
 # CONFIG_MLXSW_I2C is not set
 # CONFIG_MMC is not set
 # CONFIG_MTD is not set
-# CONFIG_NET_SWITCHDEV is not set
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_AGERE is not set