Commit 67ab5595 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-2022-01-21' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 



Kalle Valo says:

====================
wireless fixes for v5.17

First set of fixes for v5.17. This is the first pull request from the
new wireless tree and only changes to MAINTAINERS file.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0b6d8cf2 a1222ca0

MAINTAINERS

+13 −13
Original line number Diff line number Diff line
@@ -190,8 +190,9 @@ M: Johannes Berg <johannes@sipsolutions.net> 
L:	linux-wireless@vger.kernel.org

S:	Maintained

W:	https://wireless.wiki.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

Q:	https://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

F:	Documentation/driver-api/80211/cfg80211.rst

F:	Documentation/networking/regulatory.rst

F:	include/linux/ieee80211.h
@@ -11373,8 +11374,9 @@ M: Johannes Berg <johannes@sipsolutions.net> 
L:	linux-wireless@vger.kernel.org

S:	Maintained

W:	https://wireless.wiki.kernel.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

Q:	https://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

F:	Documentation/networking/mac80211-injection.rst

F:	Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst

F:	drivers/net/wireless/mac80211_hwsim.[ch]
@@ -13381,9 +13383,10 @@ NETWORKING DRIVERS (WIRELESS) 
M:	Kalle Valo <kvalo@kernel.org>

L:	linux-wireless@vger.kernel.org

S:	Maintained

Q:	http://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git

W:	https://wireless.wiki.kernel.org/

Q:	https://patchwork.kernel.org/project/linux-wireless/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git

F:	Documentation/devicetree/bindings/net/wireless/

F:	drivers/net/wireless/








@@ -13517,10 +13520,6 @@ F:	include/net/tls.h







F:	include/uapi/linux/tls.h









F:	net/tls/*

















NETWORKING [WIRELESS]









L:	linux-wireless@vger.kernel.org









Q:	http://patchwork.kernel.org/project/linux-wireless/list/

















NETXEN (1/10) GbE SUPPORT









M:	Manish Chopra <manishc@marvell.com>









M:	Rahul Verma <rahulv@marvell.com>








@@ -16539,8 +16538,9 @@ M:	Johannes Berg <johannes@sipsolutions.net>







L:	linux-wireless@vger.kernel.org









S:	Maintained









W:	https://wireless.wiki.kernel.org/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git









Q:	https://patchwork.kernel.org/project/linux-wireless/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git









F:	Documentation/ABI/stable/sysfs-class-rfkill









F:	Documentation/driver-api/rfkill.rst









F:	include/linux/rfkill.h