diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-04-23 16:47:21 -0400 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-04-23 16:47:21 -0400 |
| commit | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (patch) | |
| tree | 842b7a6410c2572bc8c1643196f83d2e19d80e1e /0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch | |
| parent | 4f478aae8055f932b9a8fdd88d93db6b9da5709e (diff) | |
| download | kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.gz kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.xz kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.zip | |
kernel-5.7.0-0.rc2.20200423git7adc4b399952.1
* Thu Apr 23 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc2.20200423git7adc4b399952.1]
- 7adc4b399952 rebase
- Match template format in kernel.spec.template ("Justin M. Forbes")
- Break out the Patches into individual files for dist-git ("Justin M. Forbes")
- Break the Red Hat patch into individual commits (Jeremy Cline)
- Adjust module filtering so CONFIG_DRM_DP_CEC can be set (Jeremy Cline)
- Add a script to generate release tags and branches (Jeremy Cline)
- Set CONFIG_VDPA for fedora ("Justin M. Forbes")
- Provide defaults in ark-rebase-patches.sh (Jeremy Cline)
- Default ark-rebase-patches.sh to not report issues (Jeremy Cline)
Resolves: rhbz#
Signed-off-by: Jeremy Cline <jcline@redhat.com>
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, 55 insertions, 0 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 new file mode 100644 index 000000000..ee4292c47 --- /dev/null +++ b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch @@ -0,0 +1,55 @@ +From dd15cdb1c47b059a1656d71597f7aad227c927e2 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 1e9302e99d05..b903580d626f 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.26.0 + |