diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-mpt-remove-certain-deprecated-pci-ids.patch | |
parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
download | kernel-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-mpt-remove-certain-deprecated-pci-ids.patch')
-rw-r--r-- | 0001-mpt-remove-certain-deprecated-pci-ids.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-mpt-remove-certain-deprecated-pci-ids.patch b/0001-mpt-remove-certain-deprecated-pci-ids.patch index a5177451d..4ebe0f9d5 100644 --- a/0001-mpt-remove-certain-deprecated-pci-ids.patch +++ b/0001-mpt-remove-certain-deprecated-pci-ids.patch @@ -35,7 +35,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com> 1 file changed, 4 insertions(+) diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index 2e2756d8a49b..a67a47d3fce1 100644 +index 08fc4b381056..1305a2b72536 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -11033,6 +11033,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) |