Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless...

# Conflicts:
#	net/wireless/nl80211.c

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

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

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

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

diff --cc net/wireless/core.c
Simple merge

diff --cc net/wireless/nl80211.c
index 34c0dfeeb7fceb0fc20625c081d047d2c7d6d7bc,aee49d43cf862de684194e8f7b40dbc6a1654707..feb90db414f70b08fd9febb42f0e794804278afc
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -16512,10 -16518,7 +16524,10 @@@ static int nl80211_assoc_ml_reconf(stru
  
        add_links = 0;
        if (info->attrs[NL80211_ATTR_MLO_LINKS]) {
-               err = nl80211_process_links(rdev, links,
 -              err = nl80211_process_links(rdev, req.add_links, NULL, 0, info);
++              err = nl80211_process_links(rdev, req.add_links,
 +                                          /* mark as MLO, but not assoc */
 +                                          IEEE80211_MLD_MAX_NUM_LINKS,
 +                                          NULL, 0, info);
                if (err)
                        return err;
  

diff --cc net/wireless/reg.c
Simple merge