Merge remote-tracking branch 'net-next/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Wed, 23 May 2018 09:05:26 +0000 (11:05 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 23 May 2018 09:05:59 +0000 (11:05 +0200)
commitdd8070bff204a67fcb6585f18047841a895b68d7
treecce17d4b8eb8987194beb40498c8f83e74d6799f
parentf3a7ca64587f58686d4e2e894e9abbfbc9dffb25
parent1fe8c06c4a0d3b589f076cd00c25082840f10423
Merge remote-tracking branch 'net-next/master' into mac80211-next

Bring in net-next which had pulled in net, so I have the changes
from mac80211 and can apply a patch that would otherwise conflict.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/mac80211_hwsim.c
include/net/mac80211.h
include/uapi/linux/nl80211.h
net/mac80211/tx.c
net/wireless/nl80211.c
net/wireless/reg.c