[F][PATCH 1/1] UBUNTU: [Config] Enable CONFIG_NET_SWITCHDEV in kernel config for s390x starting with focal

[frank.heimes at canonical.com]

From: Frank Heimes <frank.heimes at canonical.com>

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 at canonical.com>
---
 debian.master/config/annotations               | 3 ++-
 debian.master/config/s390x/config.common.s390x | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index bec875bb7182..0a456a7b4532 100644
--- 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/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index ed573d6be558..e34e50a8f023 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -331,7 +331,7 @@ 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_SWITCHDEV=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_VENDOR_ADAPTEC is not set
 # CONFIG_NET_VENDOR_AGERE is not set
-- 
2.25.0