[J][PATCH 1/1] UBUNTU: [Config] Deactivate CONFIG_QETH_OSX kernel config option

[frank.heimes at canonical.com]

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

BugLink: https://bugs.launchpad.net/bugs/1959890

The hardware generation that used OSX devices (OSA-Express for zBX)
is obsolete now. Therefore, IBM pulls the support from all Linux distros
going forward.
Hence the deactivation of the CONFIG_QETH_OSX kernel config option
for jammy and onwards.

Signed-off-by: Frank Heimes <frank.heimes at canonical.com>
---
 debian.master/config/annotations               | 1 -
 debian.master/config/config.common.ubuntu      | 2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 607bad877400..6e9a2294eda3 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6575,7 +6575,6 @@ 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'}>
 
 # Menu: Device Drivers >> Network device support >> SLIP (serial line) support
 CONFIG_SLIP                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index df22334a337b..4ea58ad6f4d8 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8479,7 +8476,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
-- 
2.34.1