Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next to resolve a conflict and to get the mac80211
rhashtable fixes so further patches can be applied on top.

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

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

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

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

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

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

diff --cc net/wireless/pmsr.c
index 21139b82749f6854e7077e30250bdcbe6c062a28,0216ab555249857daac7990886d832c0acd94856..5e2ab01d325c8f2dee653868a6c212bdef6e8f08
--- 1/net/wireless/pmsr.c
--- 2/net/wireless/pmsr.c
+++ b/net/wireless/pmsr.c
@@@ -256,9 -256,8 +256,8 @@@ int nl80211_pmsr_start(struct sk_buff *
                if (err)
                        goto out_err;
        } else {
-               memcpy(req->mac_addr, nla_data(info->attrs[NL80211_ATTR_MAC]),
-                      ETH_ALEN);
+               memcpy(req->mac_addr, wdev_address(wdev), ETH_ALEN);
 -              memset(req->mac_addr_mask, 0xff, ETH_ALEN);
 +              eth_broadcast_addr(req->mac_addr_mask);
        }
  
        idx = 0;

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