Merge net-next/main to resolve conflicts

There are a few conflicts between the work that went
into wireless and that's here now, resolve them.

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

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 aee49d43cf862de684194e8f7b40dbc6a1654707,34c0dfeeb7fceb0fc20625c081d047d2c7d6d7bc..299d575cf60eed954f3d74b8b55bef03d16cbb8f
--- 1/net/wireless/nl80211.c
--- 2/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -16518,7 -16512,10 +16524,10 @@@ static int nl80211_assoc_ml_reconf(stru
  
        add_links = 0;
        if (info->attrs[NL80211_ATTR_MLO_LINKS]) {
-               err = nl80211_process_links(rdev, req.add_links, NULL, 0, info);
 -              err = nl80211_process_links(rdev, links,
++              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;
  
@@@ -16544,15 -16543,11 +16553,15 @@@
                goto out;
        }
  
-       err = cfg80211_assoc_ml_reconf(rdev, dev, &req);
 +      if (info->attrs[NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS])
 +              req.ext_mld_capa_ops =
 +                      nla_get_u16(info->attrs[NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS]);
 +
+       err = -EOPNOTSUPP;
  
  out:
 -      for (link_id = 0; link_id < ARRAY_SIZE(links); link_id++)
 -              cfg80211_put_bss(&rdev->wiphy, links[link_id].bss);
 +      for (link_id = 0; link_id < ARRAY_SIZE(req.add_links); link_id++)
 +              cfg80211_put_bss(&rdev->wiphy, req.add_links[link_id].bss);
  
        return err;
  }

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