diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
commit | 38d5c149cae32d286308f7962e1d561e7939072f (patch) | |
tree | 25e564ee34a2fe3778379afae39270d1023fe859 /0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch | |
parent | f4c3c7a8ab9226af448d66103dfddf387711af9d (diff) | |
parent | 05706a271a8883a9bf1bc091089a315129f3db00 (diff) | |
download | kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31.tar.gz kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31.tar.xz kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31
Diffstat (limited to '0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch')
-rw-r--r-- | 0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch index 9fe8da035..e110d0564 100644 --- a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch +++ b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch @@ -44,10 +44,10 @@ Note: Simplified backport to just pci-ids 1 file changed, 6 insertions(+) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index 1d9a4866f9a7..e988251d6eef 100644 +index e92fad99338c..8dae589e7e50 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -7758,6 +7758,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -7766,6 +7766,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -55,7 +55,7 @@ index 1d9a4866f9a7..e988251d6eef 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -7770,13 +7771,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -7778,13 +7779,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, |