diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-10-07 09:54:44 -0500 |
| commit | f7a55ba381de17d8e5511a97441944b797aa62a5 (patch) | |
| tree | df2cb85063e94e396b776ea25c0e4b5f9f286c39 /0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch | |
| parent | 5f7d08ee5f8b230f5dfb20783ec265ef40387520 (diff) | |
| download | kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.gz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.tar.xz kernel-f7a55ba381de17d8e5511a97441944b797aa62a5.zip | |
kernel-5.9.0-0.rc8.20201007git7575fdda569b.29
* Wed Oct 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.20201007git7575fdda569b.29]
- Merge ark-patches
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch')
| -rw-r--r-- | 0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch deleted file mode 100644 index 60250b293..000000000 --- a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Joseph Szczypek <jszczype@redhat.com> -Date: Thu, 2 Jan 2020 14:24:40 -0500 -Subject: [PATCH] hpsa: remove old cciss-based smartarray pci ids - -Message-id: <1524750809-43700-2-git-send-email-jszczype@redhat.com> -Patchwork-id: 211573 -O-Subject: [RHEL8 e-stor PATCH 1/2] hpsa: remove old cciss-based smartarray pci ids -Bugzilla: 1471185 -RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com> -RH-Acked-by: Tomas Henzl <thenzl@redhat.com> - -Per discussion with Microsemi, the old PCI IDs for smartarrays -originally used with the old cciss driver are not being -supported with RHEL8. They are also not supported with RHEL7. -Therefore the PCI IDs and the catch-all are being removed. - - Acked-by: Don Brace <don.brace@microsemi.com> - Signed-off-by: Herton R. Krzesinski <herton@redhat.com> - -Upstream Status: RHEL only ---- - drivers/scsi/hpsa.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c -index 91794a50b31f..0c3dd00e8664 100644 ---- a/drivers/scsi/hpsa.c -+++ b/drivers/scsi/hpsa.c -@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \ - MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers"); - MODULE_VERSION(HPSA_DRIVER_VERSION); - MODULE_LICENSE("GPL"); -+#ifndef CONFIG_RHEL_DIFFERENCES - MODULE_ALIAS("cciss"); -+#endif - - static int hpsa_simple_mode; - module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR); -@@ -144,10 +146,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = { - {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D}, - {PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088}, - {PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f}, -+#ifndef CONFIG_RHEL_DIFFERENCES - {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, - {PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0}, -+#endif - {0,} - }; - --- -2.28.0 - |