diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 20:59:56 +0200 |
| commit | 7b32641801900ee7e32065b436d7318c5d7a972e (patch) | |
| tree | 7e1f1ffca46787c5ba55af0a2fc9767f9c6e5594 /0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch | |
| parent | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (diff) | |
| parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
| download | kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.gz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.tar.xz kernel-7b32641801900ee7e32065b436d7318c5d7a972e.zip | |
merge originkernel-5.8.0-0.rc3.1.vanilla.1.fc33kernel-5.8.0-0.rc3.1.vanilla.1.fc32kernel-5.8.0-0.rc3.1.vanilla.1.fc31
Diffstat (limited to '0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch')
| -rw-r--r-- | 0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch b/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch index 442ba8b54..1cc647c17 100644 --- a/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch +++ b/0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch @@ -34,7 +34,7 @@ index d48414e295a0..ba0e384412c9 100644 +++ b/drivers/scsi/lpfc/lpfc_ids.h @@ -24,6 +24,7 @@ #include <linux/pci.h> - + const struct pci_device_id lpfc_id_table[] = { +#ifndef CONFIG_RHEL_DIFFERENCES {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER, @@ -109,5 +109,5 @@ index d48414e295a0..ba0e384412c9 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, -- -2.26.2 +2.25.4 |