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

Stephen Rothwell reported quite a few conflicts in iwlwifi between
wireless-drivers and wireless-drivers-next. To avoid any problems later in
other trees merge w-d to w-d-next to fix those conflicts early.

diff --cc drivers/net/wireless/intel/iwlwifi/fw/file.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-config.h
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
index aa382f7199882c6a3a292dd83e22f05e967bfa8e,3ee6767392b61151efc774610223e2f6216d22f3..b46796944cf2d7d2acca8a92787c5101e58f4ff7
--- 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
@@@ -908,11 -864,11 +911,11 @@@ iwl_parse_nvm_mcc_info(struct device *d
                rule->flags |= NL80211_RRF_AUTO_BW;
                rule->freq_range.max_bandwidth_khz = 0;
  
-               prev_ch_flags = ch_flags;
                prev_center_freq = center_freq;
+               prev_reg_rule_flags = reg_rule_flags;
  
                IWL_DEBUG_DEV(dev, IWL_DL_LAR,
-                             "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x): %s\n",
 -                            "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n",
++                            "Ch. %d [%sGHz] %s%s%s%s%s%s%s%s%s%s%s%s(0x%02x) reg_flags 0x%x: %s\n",
                              center_freq,
                              band == NL80211_BAND_5GHZ ? "5.2" : "2.4",
                              CHECK_AND_PRINT_I(VALID),
@@@ -926,8 -878,9 +929,8 @@@
                              CHECK_AND_PRINT_I(40MHZ),
                              CHECK_AND_PRINT_I(80MHZ),
                              CHECK_AND_PRINT_I(160MHZ),
 -                            CHECK_AND_PRINT_I(INDOOR_ONLY),
 -                            CHECK_AND_PRINT_I(GO_CONCURRENT),
 +                            CHECK_AND_PRINT_I(DC_HIGH),
-                             ch_flags,
+                             ch_flags, reg_rule_flags,
                              ((ch_flags & NVM_CHANNEL_ACTIVE) &&
                               !(ch_flags & NVM_CHANNEL_RADAR))
                                         ? "Ad-Hoc" : "");

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rs.c
index 44c873082a31f47effc988a2a7ce4b35d7f9349d,8999a1199d60d27bdec88d6c638feb85403c3ced..ba7bd049d3d4e0238c0dd81e598ce097972d762e
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
@@@ -1357,8 -1312,7 +1357,7 @@@ void iwl_mvm_rs_tx_status(struct iwl_mv
                if (info->status.ampdu_ack_len == 0)
                        info->status.ampdu_len = 1;
  
-               rs_collect_tlc_data(mvm, mvmsta, tid, curr_tbl,
-                                   lq_rate.index,
 -              rs_collect_tlc_data(mvm, lq_sta, curr_tbl, tx_resp_rate.index,
++              rs_collect_tlc_data(mvm, mvmsta, tid, curr_tbl, tx_resp_rate.index,
                                    info->status.ampdu_len,
                                    info->status.ampdu_ack_len);
  
@@@ -1394,11 -1348,11 +1393,11 @@@
                                continue;
  
                        rs_collect_tpc_data(mvm, lq_sta, tmp_tbl,
-                                           lq_rate.index, 1,
+                                           tx_resp_rate.index, 1,
                                            i < retries ? 0 : legacy_success,
                                            reduced_txp);
 -                      rs_collect_tlc_data(mvm, lq_sta, tmp_tbl,
 +                      rs_collect_tlc_data(mvm, mvmsta, tid, tmp_tbl,
-                                           lq_rate.index, 1,
+                                           tx_resp_rate.index, 1,
                                            i < retries ? 0 : legacy_success);
                }
  

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/intel/iwlwifi/mvm/tx.c
Simple merge

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