Merge tag 'iwlwifi-next-for-kalle-2021-12-08' of git://git.kernel.org/pub/scm/linux...

first set of iwlwifi patches for v5.17

* A few mei fixes;
* Some improvements in D3;
* Support for new FW API commands;
* Fixes and cleanups in device configurations;
* Support some new FW API command versions;
* Fix WGDS revision 3 reading bug;
* Some firmware debugging improvements;
* Fixes for in device configuration structures;
* Improvements in the session protection code;
* Support SAR GEO Offset Mapping (SGOM) via BIOS;
* Continued work on the new Bz device family;
* Some more firmware debugging improvements;
* Support new FW API version 68;
* Add some new device IDs;
* Some other small fixes, clean-ups and improvements.

diff --cc drivers/net/wireless/intel/iwlwifi/fw/uefi.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-drv.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 8cd0ed0,92d6e3d..1393e5d
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@@ -1138,8 -1137,8 +1137,10 @@@ struct iwl_mvm 
   * @IWL_MVM_STATUS_FIRMWARE_RUNNING: firmware is running
   * @IWL_MVM_STATUS_NEED_FLUSH_P2P: need to flush P2P bcast STA
   * @IWL_MVM_STATUS_IN_D3: in D3 (or at least about to go into it)
+  * @IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE: suppress one error log
+  *    if this is set, when intentionally triggered
 + * @IWL_MVM_STATUS_STARTING: starting mac,
 + *    used to disable restart flow while in STARTING state
   */
  enum iwl_mvm_status {
        IWL_MVM_STATUS_HW_RFKILL,
@@@ -1151,7 -1150,7 +1152,8 @@@
        IWL_MVM_STATUS_FIRMWARE_RUNNING,
        IWL_MVM_STATUS_NEED_FLUSH_P2P,
        IWL_MVM_STATUS_IN_D3,
+       IWL_MVM_STATUS_SUPPRESS_ERROR_LOG_ONCE,
 +      IWL_MVM_STATUS_STARTING,
  };
  
  struct iwl_mvm_csme_conn_info {

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/ops.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Simple merge