From a686fdb36bf24163f3b20b9bc0ff6b67b25fcf95 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: May 04 2022 10:35:25 +0000 Subject: Merge branch 'users/mwilck/SLE12-SP5/for-next' into SLE12-SP5 Revert lpfc scsi driver update to 14.2.0.1 --- diff --git a/series.conf b/series.conf index 5e54208..1f08895 100644 --- a/series.conf +++ b/series.conf @@ -61094,22 +61094,6 @@ patches.suse/scsi-lpfc-Fix-typos-in-comments.patch patches.suse/scsi-qla2xxx-Fix-typos-in-comments.patch patches.suse/scsi-lpfc-Use-kcalloc.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-lpfc_iocbq.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-fast-and-slow-path.patch - patches.suse/scsi-lpfc-SLI-path-split-Introduce-lpfc_prep_wqe.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-base-ELS-paths-and.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-PLOGI-PRLI-ADISC-L.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-the-RSCN-SCR-RDF-E.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-LS_ACC-paths.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-LS_RJT-paths.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-FDISC-paths.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-misc-ELS-paths.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-CT-paths.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-SCSI-paths.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-Abort-paths.patch - patches.suse/scsi-lpfc-SLI-path-split-Refactor-BSG-paths.patch - patches.suse/scsi-lpfc-Update-lpfc-version-to-14.2.0.0.patch - patches.suse/scsi-lpfc-Copyright-updates-for-14.2.0.0-patches.patch patches.suse/powerpc-add-link-stack-flush-mitigation-status-in-de.patch patches.suse/powerpc-pseries-read-the-lpar-name-from-the-firmware.patch patches.suse/rpadlpar_io-Add-MODULE_DESCRIPTION-entries-to-kernel.patch @@ -61182,12 +61166,30 @@ ######################################################## # mkp/scsi staging - patches.suse/scsi-lpfc-improve-pci-eeh-error-and-recovery-handling.patch - patches.suse/scsi-lpfc-fix-unload-hang-after-back-to-back-pci-eeh-faults.patch - patches.suse/scsi-lpfc-fix-queue-failures-when-recovering-from-pci-parity-error.patch - patches.suse/scsi-lpfc-update-lpfc-version-to-14.2.0.1.patch - patches.suse/scsi-lpfc-fix-broken-sli4-abort-path.patch - patches.suse/scsi-lpfc-fix-locking-for-lpfc_sli_iocbq_lookup.patch + # mwilck: series-sort.py doesn't like guards in the sorted section + # moved lpfc 14.2.0.x patches down here ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-lpfc_iocbq.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-fast-and-slow-path.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Introduce-lpfc_prep_wqe.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-base-ELS-paths-and.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-PLOGI-PRLI-ADISC-L.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-the-RSCN-SCR-RDF-E.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-LS_ACC-paths.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-LS_RJT-paths.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-FDISC-paths.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-misc-ELS-paths.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-CT-paths.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-SCSI-paths.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-Abort-paths.patch ++dwagner patches.suse/scsi-lpfc-SLI-path-split-Refactor-BSG-paths.patch ++dwagner patches.suse/scsi-lpfc-Update-lpfc-version-to-14.2.0.0.patch ++dwagner patches.suse/scsi-lpfc-Copyright-updates-for-14.2.0.0-patches.patch ++dwagner patches.suse/scsi-lpfc-improve-pci-eeh-error-and-recovery-handling.patch ++dwagner patches.suse/scsi-lpfc-fix-unload-hang-after-back-to-back-pci-eeh-faults.patch ++dwagner patches.suse/scsi-lpfc-fix-queue-failures-when-recovering-from-pci-parity-error.patch ++dwagner patches.suse/scsi-lpfc-update-lpfc-version-to-14.2.0.1.patch ++dwagner patches.suse/scsi-lpfc-fix-broken-sli4-abort-path.patch ++dwagner patches.suse/scsi-lpfc-fix-locking-for-lpfc_sli_iocbq_lookup.patch ######################################################## # upstream patches broken after a merge