summaryrefslogtreecommitdiffstats
path: root/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-08-13 20:17:57 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-13 20:17:57 +0200
commitf05c02032c007399078784ea2ace322385f869b9 (patch)
tree7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
parent55576abe986db86a9f4e2b105d2451800d652217 (diff)
parentf7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff)
downloadkernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz
kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz
kernel-f05c02032c007399078784ea2ace322385f869b9.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 abddb7742..d27c3c22f 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 81d0414e2117..a3c5be79a9cc 100644
+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 " \