From 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 30 Sep 2020 10:55:26 -0500 Subject: kernel-5.9.0-0.rc7.20200930gitfb0155a09b02.21 * Wed Sep 30 2020 Fedora Kernel Team [5.9.0-0.rc7.20200930gitfb0155a09b02.21] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes --- 0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch') diff --git a/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch b/0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch index ff8a02ee7..9611ea53e 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 8da00ba54aec..cf5ccbdd7fbc 100644 +index 9b59f032a569..c27e39378aa9 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -7796,6 +7796,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -7795,6 +7795,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -55,7 +55,7 @@ index 8da00ba54aec..cf5ccbdd7fbc 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) }, -@@ -7808,13 +7809,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -7807,13 +7808,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) }, -- cgit