kernel-5.15.12-0

* Wed Dec 29 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15.12-0]
- iwlwifi: mvm: Increase the scan timeout guard to 30 seconds (Ilan Peer)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

1 files changed, 24 insertions, 10 deletions

diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index 358786b5b..187881358 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -27,6 +27,7 @@
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
  drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
  drivers/iommu/iommu.c                              |  22 ++++
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c      |   2 +-
  drivers/net/wireless/marvell/mwifiex/usb.c         |   3 +-
  drivers/nvme/host/core.c                           |  22 +++-
  drivers/nvme/host/multipath.c                      |  19 ++--
@@ -47,13 +48,13 @@
  security/lockdown/Kconfig                          |  13 +++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 49 files changed, 752 insertions(+), 201 deletions(-)
+ 50 files changed, 753 insertions(+), 202 deletions(-)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 1396fd2d9031..4bc97128cee8 100644
+index a454f438bd62..d00009504c94 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3949,6 +3949,15 @@
+@@ -3953,6 +3953,15 @@
  				please report a bug.
  		nocrs		[X86] Ignore PCI host bridge windows from ACPI.
  				If you need to use this, please report a bug.
@@ -70,7 +71,7 @@ index 1396fd2d9031..4bc97128cee8 100644
  				This is normally done in pci_enable_device(),
  				so this option is a temporary workaround
 diff --git a/Makefile b/Makefile
-index 37a1144c32df..71ebb01b9baa 100644
+index 474b2a2292ca..22cae212633b 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -101,7 +102,7 @@ index 4ebd512043be..6743668b7b33 100644
  	  The VM uses one page of physical memory for each page table.
  	  For systems with a lot of processes, this can use a lot of
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index fee914c716aa..99bb34aac703 100644
+index 0758ea0717f9..fb57b7a992d4 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -911,7 +911,7 @@ endchoice
@@ -249,7 +250,7 @@ index 9b9fb7882c20..e8dc9bc327bd 100644
  		entry = &e820_table->entries[i];
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index d71267081153..5f7b1c67ddcc 100644
+index 48596f9fddf4..b31d4f581b66 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -20,6 +20,7 @@
@@ -260,7 +261,7 @@ index d71267081153..5f7b1c67ddcc 100644
  #include <linux/usb/xhci-dbgp.h>
  #include <linux/static_call.h>
  #include <linux/swiotlb.h>
-@@ -941,6 +942,13 @@ void __init setup_arch(char **cmdline_p)
+@@ -929,6 +930,13 @@ void __init setup_arch(char **cmdline_p)
  	if (efi_enabled(EFI_BOOT))
  		efi_init();
 
@@ -274,7 +275,7 @@ index d71267081153..5f7b1c67ddcc 100644
  	dmi_setup();
 
  	/*
-@@ -1106,19 +1114,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1094,19 +1102,7 @@ void __init setup_arch(char **cmdline_p)
  	/* Allocate bigger log buffer */
  	setup_log_buf(1);
 
@@ -647,7 +648,7 @@ index bbf7029e224b..cf7faa970dd6 100644
  		dmi_decode_ipmi((const struct dmi_header *) dev->device_data);
 
 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index b404cc46cbda..c74d611bcb79 100644
+index fe91090e04a4..f00bc6886913 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -35,6 +35,7 @@
@@ -658,7 +659,7 @@ index b404cc46cbda..c74d611bcb79 100644
  #include <linux/delay.h>
 
  #define IPMI_DRIVER_VERSION "39.2"
-@@ -5173,8 +5174,21 @@ static int __init ipmi_init_msghandler_mod(void)
+@@ -5178,8 +5179,21 @@ static int __init ipmi_init_msghandler_mod(void)
  {
  	int rv;
 
@@ -1448,6 +1449,19 @@ index 3303d707bab4..372edaaafaa1 100644
  /*
   * Changes the default domain of an iommu group that has *only* one device
   *
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+index d78e436fa8b5..b064d3137e46 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+@@ -2490,7 +2490,7 @@ static int iwl_mvm_check_running_scans(struct iwl_mvm *mvm, int type)
+ 	return -EIO;
+ }
+
+-#define SCAN_TIMEOUT 20000
++#define SCAN_TIMEOUT 30000
+
+ void iwl_mvm_scan_timeout_wk(struct work_struct *work)
+ {
 diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
 index 9736aa0ab7fd..8f01fcbe9396 100644
 --- a/drivers/net/wireless/marvell/mwifiex/usb.c