Comment 4 for bug 1943464

Thanks for the update, Niklas.
Ok, we need to address all this for all Ubuntu releases that are in service, up to the oldest that needs to be patched - and these are in this case impish, hirsute and focal

Since we pick the upstream stables v5.10 and v5.14 (since 5.13 reached EOL) for Ubuntu hirsute's 5.11 and for impish's 5.13, it looks like we don't need to SRU there and just wait until the kernel team has picked up the relevant upstream stable updates v5.14.15 respectively v5.10.76 - which is great. Only focal is left.

So I started over with a pristine focal master-next tree (git clone git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/focal --branch master-next --single-branch)
but wasn't able to cherry-pick a46044a92add cleanly and get merge conflicts in
 both modified: arch/s390/include/asm/pci.h
 both modified: arch/s390/pci/pci.c
 both modified: arch/s390/pci/pci_event.c
I assumed that the pre-req. commit (that is needed in case the refactoring was done), is not part of the 5.4.x tree, hence not needed in this case.
So I (initially) didn't applied it (well, later I even tried with applying that pre-req. commit first, and the pre-req. commit itself applied cleanly, but no changes with the above merge conflicts while trying to cherry-pick the actual fix a46044a92add).

I think either some more pre-req. are needed for getting a46044a92add into focal's kernel 5.4x - or a backport of upstream a46044a92add is needed?!