I was able to apply the patches, but only in the order:
1) apply 0001-s390-pci-Recover-handle-in-clp_set_pci_fn.patch (based on 17cdec960cf7)
2) cherry-pick 576c75e36c68
However, the test compile (on focal, but that shouldn't matter) failed:
...
CC [M] fs/afs/inode.o
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_clp.c: In function ‘clp_disable_fh’:
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_clp.c:295:6: warning: unused variable ‘fh’ [-Wunused-variable]
295 | u32 fh = zdev->fh;
| ^~
CC crypto/lzo.o
CC security/keys/request_key.o
CC arch/s390/pci/pci_sysfs.o
CC security/smack/smack_lsm.o
CC kernel/power/wakelock.o
CC [M] fs/afs/main.o
CC security/selinux/hooks.o
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_sysfs.c: In function ‘recover_store’:
/home/ubuntu/bionic-lp1870320/arch/s390/pci/pci_sysfs.c:73:6: error: implicit declaration of function ‘pci_dev_is_added’; did you mean ‘pci_device_add’? [-Werror=implicit-function-declaration]
73 | if (pci_dev_is_added(pdev)) {
| ^~~~~~~~~~~~~~~~
| pci_device_add
CC crypto/rng.o
cc1: some warnings being treated as errors
...
I was able to apply the patches, but only in the order: pci-Recover- handle- in-clp_ set_pci_ fn.patch (based on 17cdec960cf7)
1) apply 0001-s390-
2) cherry-pick 576c75e36c68
However, the test compile (on focal, but that shouldn't matter) failed:
make[2]: Leaving directory '/home/ ubuntu/ bionic- lp1870320/ debian/ build/build- generic' ubuntu/ bionic- lp1870320' rules.d/ 2-binary- arch.mk: 50: /home/ubuntu/ bionic- lp1870320/ debian/ stamps/ stamp-build- generic] Error 2 s1lp15: ~/bionic- lp1870320$
make[1]: *** [Makefile:146: sub-make] Error 2
make[1]: Leaving directory '/home/
make: *** [debian/
ubuntu@
due to:
... bionic- lp1870320/ arch/s390/ pci/pci_ clp.c: In function ‘clp_disable_fh’: bionic- lp1870320/ arch/s390/ pci/pci_ clp.c:295: 6: warning: unused variable ‘fh’ [-Wunused-variable] keys/request_ key.o pci/pci_ sysfs.o smack/smack_ lsm.o power/wakelock. o selinux/ hooks.o bionic- lp1870320/ arch/s390/ pci/pci_ sysfs.c: In function ‘recover_store’: bionic- lp1870320/ arch/s390/ pci/pci_ sysfs.c: 73:6: error: implicit declaration of function ‘pci_dev_is_added’; did you mean ‘pci_device_add’? [-Werror= implicit- function- declaration] is_added( pdev)) {
CC [M] fs/afs/inode.o
/home/ubuntu/
/home/ubuntu/
295 | u32 fh = zdev->fh;
| ^~
CC crypto/lzo.o
CC security/
CC arch/s390/
CC security/
CC kernel/
CC [M] fs/afs/main.o
CC security/
/home/ubuntu/
/home/ubuntu/
73 | if (pci_dev_
| ^~~~~~~~~~~~~~~~
| pci_device_add
CC crypto/rng.o
cc1: some warnings being treated as errors
...