diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-09 18:44:37 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-09 18:44:37 +0100 |
commit | ee3f176b7e58fe2527443eac025aceb706897527 (patch) | |
tree | f8d7d37c528dc9b05f66f98dfa32138f635d8a55 /patch-5.10.0-redhat.patch | |
parent | b44b2ecbe7de047c288fd5f1877e36e35a5abff7 (diff) | |
parent | f18b77c4dab0d3d938eabc45881ab87682f22c66 (diff) | |
download | kernel-ee3f176b7e58fe2527443eac025aceb706897527.tar.gz kernel-ee3f176b7e58fe2527443eac025aceb706897527.tar.xz kernel-ee3f176b7e58fe2527443eac025aceb706897527.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc7.20201209gita68a0262abda.95.vanilla.1.fc33
Diffstat (limited to 'patch-5.10.0-redhat.patch')
-rw-r--r-- | patch-5.10.0-redhat.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch index 71bed1c5d..a71a191bf 100644 --- a/patch-5.10.0-redhat.patch +++ b/patch-5.10.0-redhat.patch @@ -1984,10 +1984,10 @@ index d48414e295a0..ba0e384412c9 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index 41cd66fc7d81..2bc149710f3d 100644 +index e158d3d62056..f63c55b6408c 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c -@@ -138,6 +138,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance, +@@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance, */ static struct pci_device_id megasas_pci_table[] = { @@ -1995,7 +1995,7 @@ index 41cd66fc7d81..2bc149710f3d 100644 {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)}, /* xscale IOP */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)}, -@@ -156,6 +157,7 @@ static struct pci_device_id megasas_pci_table[] = { +@@ -151,6 +152,7 @@ static struct pci_device_id megasas_pci_table[] = { /* xscale IOP, vega */ {PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)}, /* xscale IOP */ |