Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/cfg/a000.c
index 076f8d6,a440140..c911d55
--- 1/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
--- 2/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/a000.c
@@@ -133,18 -133,17 +133,18 @@@ static const struct iwl_ht_params iwl_a
        .use_tfh = true,                                                \
        .rf_id = true,                                                  \
        .gen2 = true,                                                   \
-       .ext_nvm = true,                                                \
+       .nvm_type = IWL_NVM_EXT,                                        \
 -      .dbgc_supported = true
 +      .dbgc_supported = true,                                         \
 +      .tx_cmd_queue_size = 32
  
  const struct iwl_cfg iwla000_2ac_cfg_hr = {
 -              .name = "Intel(R) Dual Band Wireless AC a000",
 -              .fw_name_pre = IWL_A000_HR_FW_PRE,
 -              IWL_DEVICE_A000,
 -              .ht_params = &iwl_a000_ht_params,
 -              .nvm_ver = IWL_A000_NVM_VERSION,
 -              .nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
 -              .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
 +      .name = "Intel(R) Dual Band Wireless AC a000",
 +      .fw_name_pre = IWL_A000_HR_FW_PRE,
 +      IWL_DEVICE_A000,
 +      .ht_params = &iwl_a000_ht_params,
 +      .nvm_ver = IWL_A000_NVM_VERSION,
 +      .nvm_calib_ver = IWL_A000_TX_POWER_VERSION,
 +      .max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,
  };
  
  const struct iwl_cfg iwla000_2ac_cfg_hr_cdb = {

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

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-config.h
index b9f3b35,71cb1ec..0347a03
--- 1/drivers/net/wireless/intel/iwlwifi/iwl-config.h
--- 2/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@@ -320,9 -332,7 +332,9 @@@ struct iwl_pwr_tx_backoff 
   * @integrated: discrete or integrated
   * @gen2: a000 and on transport operation
   * @cdb: CDB support
-  * @ext_nvm: extended NVM format
+  * @nvm_type: see &enum iwl_nvm_type
 + * @tx_cmd_queue_size: size of the cmd queue. If zero, use the same value as
 + *    the regular queues
   *
   * We enable the driver to be backward compatible wrt. hardware features.
   * API differences in uCode shouldn't be handled here but through TLVs
@@@ -371,9 -382,7 +384,8 @@@ struct iwl_cfg 
            use_tfh:1,
            gen2:1,
            cdb:1,
-           ext_nvm:1,
            dbgc_supported:1;
 +      u16 tx_cmd_queue_size;
        u8 valid_tx_ant;
        u8 valid_rx_ant;
        u8 non_shared_ant;

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index d9a2ea9,c3a5d8c..8928613
--- 1/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
--- 2/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
@@@ -75,10 -75,9 +75,10 @@@
  #include "iwl-prph.h"
  #include "iwl-io.h"
  #include "iwl-csr.h"
 +#include "fw/acpi.h"
  
  /* NVM offsets (in words) definitions */
- enum wkp_nvm_offsets {
+ enum nvm_offsets {
        /* NVM HW-Section offset (in words) definitions */
        SUBSYSTEM_ID = 0x0A,
        HW_ADDR = 0x15,

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/d3.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 7fa7849,949e634..bf25c3c
--- 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
@@@ -1008,9 -1015,12 +1008,12 @@@ struct iwl_mvm 
        bool drop_bcn_ap_mode;
  
        struct delayed_work cs_tx_unblock_dwork;
+ 
+       /* does a monitor vif exist (only one can exist hence bool) */
+       bool monitor_on;
  #ifdef CONFIG_ACPI
 -      struct iwl_mvm_sar_profile sar_profiles[IWL_MVM_SAR_PROFILE_NUM];
 -      struct iwl_mvm_geo_profile geo_profiles[IWL_NUM_GEO_PROFILES];
 +      struct iwl_mvm_sar_profile sar_profiles[ACPI_SAR_PROFILE_NUM];
 +      struct iwl_mvm_geo_profile geo_profiles[ACPI_NUM_GEO_PROFILES];
  #endif
  };
  

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

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

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

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

diff --cc drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/quantenna/qtnfmac/event.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
Simple merge