diff options
Diffstat (limited to 'patch-5.19-redhat.patch')
| -rw-r--r-- | patch-5.19-redhat.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index 9c6147cd1..852246cfc 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -89,10 +89,10 @@ 88 files changed, 2766 insertions(+), 324 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index c0fdb04a0435..f5de4eb69748 100644 +index cc3ea8febc62..6a3945cae35a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6315,6 +6315,15 @@ +@@ -6317,6 +6317,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -298,7 +298,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index b79c1c18149d..d6aa78ebf187 100644 +index df92892325ae..048bb4a5b5e9 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -3350,10 +3350,10 @@ index 0917b05059b4..38cef4e394fb 100644 /* Fusion */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index b519f4b59d30..3e51c2e8cb69 100644 +index 5e8887fa02c8..e4a33a1d641d 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -12606,6 +12606,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) +@@ -12607,6 +12607,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[] = { @@ -3361,7 +3361,7 @@ index b519f4b59d30..3e51c2e8cb69 100644 /* Spitfire ~ 2004 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12624,6 +12625,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12625,6 +12626,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 }, @@ -3369,7 +3369,7 @@ index b519f4b59d30..3e51c2e8cb69 100644 /* Thunderbolt ~ 2208 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12648,9 +12650,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12649,9 +12651,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 }, |