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

From: Frank Heimes <frank.heimes@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@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(-)

I just want to leave an additional comment,
mentioning that I did not ran 'updatesconfigs' before submitting, like I
usually do,
since that led to a lot of unwanted changes in my local 'unstable' clone,
that I didn't wanted to submit, since they are unrelated to this patch
submission.

Because after running 'updatesconfigs' (in an earlier try) I see
modifications in these files:


user@box:~/ubuntu-unstable-lp1906370$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
modified:   debian.master/config/amd64/config.common.amd64
modified:   debian.master/config/annotations
modified:   debian.master/config/arm64/config.common.arm64
modified:   debian.master/config/armhf/config.common.armhf
modified:   debian.master/config/config.common.ubuntu
modified:   debian.master/config/ppc64el/config.common.ppc64el
modified:   debian.master/config/s390x/config.common.s390x

Untracked files:
  (use "git add <file>..." to include in what will be committed)
debian/changelog
debian/control
debian/copyright
scripts/ubuntu-retpoline-extract-one

no changes added to commit (use "git add" and/or "git commit -a")
user@box:~/ubuntu-unstable-lp1906370$


Some of them are relevant, like:


user@box:~/ubuntu-unstable-lp1906370$ diff debian.master/config/annotations
~/ubuntu-unstable-clean/debian.master/config/annotations
6135c6135
< CONFIG_QETH_OSN                                 policy<{'s390x': 'n'}>
---
> CONFIG_QETH_OSN                                 policy<{'s390x': 'y'}>
6137,6138d6136
< #
< CONFIG_QETH_OSN note<LP:1906370>
user@box:~/ubuntu-unstable-lp1906370$


But others are not (at least definitely not for this patch submission and
the underlying LP bug, like below ARM64, GCC and LD changes):


user@box:~/ubuntu-unstable-lp1906370$ diff
debian.master/config/config.common.ubuntu
~/ubuntu-unstable-clean/debian.master/config/config.common.ubuntu
603a604
> CONFIG_ARM64_BTI_KERNEL=y
3694c3695
< CONFIG_GCC_VERSION=90300
---
> CONFIG_GCC_VERSION=100200
5381c5382
< CONFIG_LD_VERSION=234000000
---
> CONFIG_LD_VERSION=235010000
8106c8107
< # CONFIG_QETH_OSN is not set
---
> CONFIG_QETH_OSN=y
user@box:~/ubuntu-unstable-lp1906370$

user@box:~/ubuntu-unstable-lp1906370$ diff
debian.master/config/s390x/config.common.s390x
~/ubuntu-unstable-clean/debian.master/config/s390x/config.common.s390x
50c50
< CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc (Ubuntu
9.3.0-17ubuntu1~20.04) 9.3.0"
---
> CONFIG_CC_VERSION_TEXT="s390x-linux-gnu-gcc (Ubuntu 10.2.0-19ubuntu2)
10.2.0"
user@box:~/ubuntu-unstable-lp1906370$


Hope this patch submission will be considered anyhow ...

Bye, Frank

On Tue, Dec 08, 2020 at 08:05:15AM +0100, Frank Heimes wrote:
> I just want to leave an additional comment,
> mentioning that I did not ran 'updatesconfigs' before submitting, like I
> usually do,
> since that led to a lot of unwanted changes in my local 'unstable' clone,
> that I didn't wanted to submit, since they are unrelated to this patch
> submission.
> 
> Because after running 'updatesconfigs' (in an earlier try) I see
> modifications in these files:

This happens when the compiler in your environment is different form the
one last used to update the configs. I'd suggest that you first run
updateconfigs without any changes, make a temporary commit with the
results, then make your changes and run updateconfigs again. This should
isolate the changes you're making from these other changes that you
don't want to include in your patch.

Applied after updateconfigs. I also made some whitespace adjustments to
the annotations updates (indentation in that file uses spaces, not
tabs). Thanks!