summaryrefslogtreecommitdiffstats
path: root/0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-09-30 18:44:02 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-09-30 18:44:02 +0200
commite5237f62c21f764ed70f1abcea884b15f30ca984 (patch)
tree30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch
parente3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff)
parent8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff)
downloadkernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz
kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz
kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.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 425b07161..60250b293 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 48d5da59262b..84d90eedb067 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 " \