Merge wireless into wireless-next

There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --cc drivers/net/wireless/intel/iwlwifi/fw/acpi.c
index ba94f6e,cb9181f..018d820
--- 1/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
--- 2/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
@@@ -38,37 -38,9 +38,37 @@@ static const struct dmi_system_id dmi_p
        },
        { .ident = "ASUS",
          .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek COMPUTER INC."),
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
                },
        },
 +      { .ident = "GOOGLE-HP",
 +        .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Google"),
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
 +              },
 +      },
 +      { .ident = "GOOGLE-ASUS",
 +        .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Google"),
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTek COMPUTER INC."),
 +              },
 +      },
 +      { .ident = "GOOGLE-SAMSUNG",
 +        .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Google"),
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "SAMSUNG ELECTRONICS CO., LTD"),
 +              },
 +      },
 +      { .ident = "DELL",
 +        .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
 +              },
 +      },
 +      { .ident = "DELL",
 +        .matches = {
 +                      DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
 +              },
 +      },
        {}
  };
  

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

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index bd5ba93,17f788a..1ade1f0
--- 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
@@@ -3656,9 -3669,10 +3653,10 @@@ static in
  iwl_mvm_sta_state_notexist_to_none(struct iwl_mvm *mvm,
                                   struct ieee80211_vif *vif,
                                   struct ieee80211_sta *sta,
 -                                 struct iwl_mvm_sta_state_ops *callbacks)
 +                                 const struct iwl_mvm_sta_state_ops *callbacks)
  {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+       struct ieee80211_link_sta *link_sta;
        unsigned int i;
        int ret;
  

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index bba3acd,9e5008e..7b5db55
--- 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
@@@ -2361,13 -2346,8 +2361,14 @@@ int iwl_mvm_mld_update_sta_keys(struct 
                                struct ieee80211_sta *sta,
                                u32 old_sta_mask,
                                u32 new_sta_mask);
 +int iwl_mvm_mld_send_key(struct iwl_mvm *mvm, u32 sta_mask, u32 key_flags,
 +                       struct ieee80211_key_conf *keyconf);
 +u32 iwl_mvm_get_sec_flags(struct iwl_mvm *mvm,
 +                        struct ieee80211_vif *vif,
 +                        struct ieee80211_sta *sta,
 +                        struct ieee80211_key_conf *keyconf);
  
+ bool iwl_rfi_supported(struct iwl_mvm *mvm);
  int iwl_rfi_send_config_cmd(struct iwl_mvm *mvm,
                            struct iwl_rfi_lut_entry *rfi_table);
  struct iwl_rfi_freq_table_resp_cmd *iwl_rfi_get_freq_table(struct iwl_mvm *mvm);

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

diff --cc drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/mac80211.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw88/sdio.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/core.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/mac.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/mac.h
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/mac80211.c
Simple merge

diff --cc drivers/net/wireless/realtek/rtw89/rtw8852b.c
Simple merge

diff --cc drivers/net/wireless/virtual/mac80211_hwsim.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/chan.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge