Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Fri, 1 Feb 2019 10:05:27 +0000 (11:05 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 1 Feb 2019 10:05:35 +0000 (11:05 +0100)
commit752cfee90d11e280d727617bf8d6df894141e157
treec55feff5c93af364fe2212d6b2942abb3748e05c
parent5ac4a12df58121f0cf874b518406ec2a8e2d4ac4
parentfa6821cbf1d9724284ef0906c9a01a5fbf13a35c
Merge remote-tracking branch 'net-next/master' into mac80211-next

Merge net-next so that we get the changes from net, which would
otherwise conflict with the NLA_POLICY_NESTED/_ARRAY changes.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/virt_wifi.c
net/mac80211/cfg.c
net/wireless/nl80211.c
net/wireless/reg.c