diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-08 21:24:48 +0200 |
commit | 38d5c149cae32d286308f7962e1d561e7939072f (patch) | |
tree | 25e564ee34a2fe3778379afae39270d1023fe859 /0001-mpt-remove-certain-deprecated-pci-ids.patch | |
parent | f4c3c7a8ab9226af448d66103dfddf387711af9d (diff) | |
parent | 05706a271a8883a9bf1bc091089a315129f3db00 (diff) | |
download | kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.gz kernel-38d5c149cae32d286308f7962e1d561e7939072f.tar.xz kernel-38d5c149cae32d286308f7962e1d561e7939072f.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200608gitaf7b4801030c.1.vanilla.1.fc31
Diffstat (limited to '0001-mpt-remove-certain-deprecated-pci-ids.patch')
-rw-r--r-- | 0001-mpt-remove-certain-deprecated-pci-ids.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-mpt-remove-certain-deprecated-pci-ids.patch b/0001-mpt-remove-certain-deprecated-pci-ids.patch index efd99e59b..196f8c174 100644 --- a/0001-mpt-remove-certain-deprecated-pci-ids.patch +++ b/0001-mpt-remove-certain-deprecated-pci-ids.patch @@ -35,10 +35,10 @@ 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 04a40afe60e3..cec7799dc23f 100644 +index 08fc4b381056..1305a2b72536 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -11031,6 +11031,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) +@@ -11033,6 +11033,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) * The pci device ids are defined in mpi/mpi2_cnfg.h. */ static const struct pci_device_id mpt3sas_pci_table[] = { @@ -46,7 +46,7 @@ index 04a40afe60e3..cec7799dc23f 100644 /* Spitfire ~ 2004 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, PCI_ANY_ID, PCI_ANY_ID }, -@@ -11049,6 +11050,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -11051,6 +11052,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, PCI_ANY_ID, PCI_ANY_ID }, @@ -54,7 +54,7 @@ index 04a40afe60e3..cec7799dc23f 100644 /* Thunderbolt ~ 2208 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, PCI_ANY_ID, PCI_ANY_ID }, -@@ -11073,9 +11075,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -11075,9 +11077,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1, PCI_ANY_ID, PCI_ANY_ID }, |