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-27 19:48:54 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-27 19:48:54 +0200
commitbe305682f0f037608ba1884e677c56d30877d699 (patch)
tree53a33b12b4434182720920a9da81e27d2d40c7ed /0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
parent8646321dee2344a7d6b8c53bc1694c23d6992fe8 (diff)
parent13bd6da63cf611a8325774f77a657cf8a6a0fc66 (diff)
downloadkernel-be305682f0f037608ba1884e677c56d30877d699.tar.gz
kernel-be305682f0f037608ba1884e677c56d30877d699.tar.xz
kernel-be305682f0f037608ba1884e677c56d30877d699.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.20200827git15bc20c6af4c.1.vanilla.2.fc32
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 d27c3c22f..c8089ff66 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 91794a50b31f..0c3dd00e8664 100644
+index 48d5da59262b..84d90eedb067 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \