Merge net-next/main to resolve conflicts

The wireless-next tree was based on something older, and there
are now conflicts between -rc2 and work here. Merge net-next,
which has enough of -rc2 for the conflicts to happen, resolving
them in the process.

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

diff --cc Documentation/networking/net_cachelines/net_device.rst
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
Simple merge

diff --cc drivers/staging/vt6655/TODO
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

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

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

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

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

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