UBUNTU: [Config] disable CONFIG_QETH_OSX on s390x

BugLink: https://bugs.launchpad.net/bugs/1959890
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index b99c8cba186895a7388be152e1b15032a5cd572c..83aaab39a33d319b9c700da3f603a251197f961c 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6502,7 +6502,9 @@ CONFIG_ISM                                      mark<ENFORCED> note<LP: #1789934
 CONFIG_QETH                                     policy<{'s390x': 'm'}>
 CONFIG_QETH_L2                                  policy<{'s390x': 'm'}>
 CONFIG_QETH_L3                                  policy<{'s390x': 'm'}>
-CONFIG_QETH_OSX                                 policy<{'s390x': 'y'}>
+CONFIG_QETH_OSX                                 policy<{'s390x': 'n'}>
+#
+CONFIG_QETH_OSX                                 mark<ENFORCED> note<LP: #1959890>
 
 # Menu: Device Drivers >> Network device support >> SLIP (serial line) support
 CONFIG_SLIP                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'n'}>

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a54a153fe2363ca67015baf5949dd244bb61515d..0dd9f6b109de1f06a9cb3e726a20a7a216019053 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8852,7 +8852,7 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH=m
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
-CONFIG_QETH_OSX=y
+# CONFIG_QETH_OSX is not set
 CONFIG_QE_GPIO=y
 CONFIG_QE_TDM=y
 CONFIG_QE_USB=y