[PATCH][Unstable] UBUNTU: [Config] Deactivate CONFIG_QETH_OSN kernel config option

[frank.heimes at canonical.com]

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

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

The final shipment of OSN devices was as part of the IBM z13 hardware generation.
The primary exploiter was the IBM Communication Controller,
which was pulled out of marketing in March 2015 and should be out of service now.
Therefore, IBM pulls the support from all Linux distros going forward.
Hence the deactivation of the CONFIG_QETH_OSN kernel config option for hirsute and onwards.

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

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index f0574779e275..71622a39e4bf 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6132,8 +6132,10 @@ CONFIG_ISM                                      mark<ENFORCE> note<LP:1789934>
 CONFIG_QETH                                     policy<{'s390x': 'm'}>
 CONFIG_QETH_L2                                  policy<{'s390x': 'm'}>
 CONFIG_QETH_L3                                  policy<{'s390x': 'm'}>
-CONFIG_QETH_OSN                                 policy<{'s390x': 'y'}>
+CONFIG_QETH_OSN                                 policy<{'s390x': 'n'}>
 CONFIG_QETH_OSX                                 policy<{'s390x': 'y'}>
+#
+CONFIG_QETH_OSN					note<LP:1906370>
 
 # 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 6f935b3a0efd..432af369b3be 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8104,7 +8104,7 @@ CONFIG_QED_SRIOV=y
 CONFIG_QETH=m
 CONFIG_QETH_L2=m
 CONFIG_QETH_L3=m
-CONFIG_QETH_OSN=y
+CONFIG_QETH_OSN=n
 CONFIG_QETH_OSX=y
 CONFIG_QE_GPIO=y
 CONFIG_QE_TDM=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 1292a3402f25..b2e074a5e3f1 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -397,6 +397,7 @@ CONFIG_MEM_SOFT_DIRTY=y
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_QETH_OSN is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFC is not set
 # CONFIG_NFP is not set
-- 
2.25.1