summaryrefslogtreecommitdiffstats
path: root/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-15 05:42:19 +0200
commitd0b8941357b7ce0c26d19376bc4d827042d6bb12 (patch)
tree61138493dd96ee303830bc148d607fb915562b77 /0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
parentf7ab3f33fe442b453cab73ec62b87ea9a757e0c7 (diff)
parentdadba4a34d797d91b5524e2ea22dc6374a2d85b1 (diff)
downloadkernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.gz
kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.tar.xz
kernel-d0b8941357b7ce0c26d19376bc4d827042d6bb12.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.1.vanilla.1.fc33kernel-5.8.0-0.rc1.1.vanilla.1.fc32kernel-5.8.0-0.rc1.1.vanilla.1.fc31
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.patch2
1 files changed, 1 insertions, 1 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
index a492ea72c..abddb7742 100644
--- a/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
+++ b/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
@@ -24,7 +24,7 @@ Upstream Status: RHEL only
1 file changed, 4 insertions(+)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 1e9302e99d05..b903580d626f 100644
+index 81d0414e2117..a3c5be79a9cc 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \