diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-11-29 07:20:47 -0600 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-11-29 07:20:47 -0600 |
commit | 24c54b66f612ef44208248ded797fde114e72ebe (patch) | |
tree | e009238e94dae60ca8a58370de50a79bf92a049e /patch-5.16-redhat.patch | |
parent | 88e40a46831279b99ec52a1b7aeea59c4db8b84e (diff) | |
download | kernel-24c54b66f612ef44208248ded797fde114e72ebe.tar.gz kernel-24c54b66f612ef44208248ded797fde114e72ebe.tar.xz kernel-24c54b66f612ef44208248ded797fde114e72ebe.zip |
kernel-5.16-0.rc2.20211124git5d9f4cf36721.19
* Wed Nov 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc2.20211124git5d9f4cf36721.19]
- Fix up PREEMPT configs (Justin M. Forbes)
- New configs in drivers/media (Fedora Kernel Team)
- New configs in drivers/net/ethernet/litex (Fedora Kernel Team)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.16-redhat.patch')
-rw-r--r-- | patch-5.16-redhat.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index dd9ae85c6..ebc8b3b8b 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 72b0c3d5cbad..d84f7c164563 100644 +index 0a6ecc8bb2d2..b339e50d93e8 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -270,7 +270,7 @@ index 0083464de5e3..2de5f417f3f2 100644 setup_force_cpu_cap(X86_FEATURE_CPUID); cpu_parse_early_param(); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index c410be738ae7..dcbff059b842 100644 +index 6a190c7f4d71..3fbfbf6ed21c 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -20,6 +20,7 @@ @@ -1947,10 +1947,10 @@ index aeb95f409826..68a999b02009 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 cee7170beae8..3f9d70325677 100644 +index 00792767c620..2ee890521ed7 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -12550,6 +12550,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) +@@ -12605,6 +12605,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[] = { @@ -1958,7 +1958,7 @@ index cee7170beae8..3f9d70325677 100644 /* Spitfire ~ 2004 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12568,6 +12569,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12623,6 +12624,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 }, @@ -1966,7 +1966,7 @@ index cee7170beae8..3f9d70325677 100644 /* Thunderbolt ~ 2208 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12592,9 +12594,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12647,9 +12649,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 }, @@ -2030,10 +2030,10 @@ index 8987acc24dac..5013d52a7211 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 86658a81d284..5647f4756e97 100644 +index 00070a8a6507..e9e0ffa990cd 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5657,6 +5657,13 @@ static void hub_event(struct work_struct *work) +@@ -5666,6 +5666,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); |