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

This is to fix some conflicts in iwlwifi.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
	drivers/net/wireless/intel/iwlwifi/mvm/scan.c

diff --cc drivers/net/wireless/ath/ath10k/core.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/htt_rx.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 53761c4f7a0fc3ab06b688d8503fc20a32bce812,18a8474b5760ca6ce6c5636a0e39770232ae818a..6d6064534d590c76f71444bfa7f3b0c9163ad003
--- 1/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
--- 2/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@@ -3933,13 -3898,8 +3933,13 @@@ static void iwl_mvm_mac_sta_statistics(
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
        struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
  
-       if (fw_has_capa(&mvm->fw->ucode_capa,
-                       IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
 +      if (mvmsta->avg_energy) {
 +              sinfo->signal_avg = mvmsta->avg_energy;
 +              sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL_AVG);
 +      }
 +
+       if (!fw_has_capa(&mvm->fw->ucode_capa,
+                        IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))
                return;
  
        /* if beacon filtering isn't on mac80211 does it anyway */

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/realtek/rtl8xxxu/rtl8xxxu_8192e.c
Simple merge