Commit 8911097f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wimax-staging' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground 



Arnd Bergmann says:

====================
wimax: move to staging

After I sent a fix for what appeared to be a harmless warning in
the wimax user interface code, the conclusion was that the whole
thing has most likely not been used in a very long time, and the
user interface possibly been broken since b61a5eea ("wimax: use
genl_register_family_with_ops()").

Using a shared branch between net-next and staging should help
coordinate patches getting submitted against it.
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 72671b35 f54ec58f

Documentation/admin-guide/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ configure specific aspects of kernel behavior to your liking. 
   unicode

   vga-softcursor

   video-output

   wimax/index

   xfs



.. only::  subproject and html

Documentation/networking/kapi.rst

+0 −21
Original line number Diff line number Diff line
@@ -83,27 +83,6 @@ SUN RPC subsystem 
.. kernel-doc:: net/sunrpc/clnt.c

   :export:



WiMAX

-----



.. kernel-doc:: net/wimax/op-msg.c

   :export:



.. kernel-doc:: net/wimax/op-reset.c

   :export:



.. kernel-doc:: net/wimax/op-rfkill.c

   :export:



.. kernel-doc:: net/wimax/stack.c

   :export:



.. kernel-doc:: include/net/wimax.h

   :internal:



.. kernel-doc:: include/uapi/linux/wimax.h

   :internal:



Network device support

======================

Documentation/translations/zh_CN/admin-guide/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ Todolist: 
   unicode

   vga-softcursor

   video-output

   wimax/index

   xfs



.. only::  subproject and html

MAINTAINERS

+0 −22
Original line number Diff line number Diff line
@@ -9106,16 +9106,6 @@ W: https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git

F:	drivers/net/wireless/intel/iwlwifi/









INTEL WIRELESS WIMAX CONNECTION 2400









M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>









M:	linux-wimax@intel.com









L:	wimax@linuxwimax.org (subscribers-only)









S:	Supported









W:	http://linuxwimax.org









F:	Documentation/admin-guide/wimax/i2400m.rst









F:	drivers/net/wimax/i2400m/









F:	include/uapi/linux/wimax/i2400m.h

















INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER









M:	Jithu Joseph <jithu.joseph@intel.com>









R:	Maurice Ma <maurice.ma@intel.com>








@@ -18907,18 +18897,6 @@ S:	Supported







W:	https://wireless.wiki.kernel.org/en/users/Drivers/wil6210









F:	drivers/net/wireless/ath/wil6210/

















WIMAX STACK









M:	Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>









M:	linux-wimax@intel.com









L:	wimax@linuxwimax.org (subscribers-only)









S:	Supported









W:	http://linuxwimax.org









F:	Documentation/admin-guide/wimax/wimax.rst









F:	include/linux/wimax/debug.h









F:	include/net/wimax.h









F:	include/uapi/linux/wimax.h









F:	net/wimax/

















WINBOND CIR DRIVER









M:	David Härdeman <david@hardeman.nu>









S:	Maintained

























drivers/net/Kconfig



+0
−2






























Original line number
Diff line number
Diff line







@@ -489,8 +489,6 @@ source "drivers/net/usb/Kconfig"

















source "drivers/net/wireless/Kconfig"



















source "drivers/net/wimax/Kconfig"



















source "drivers/net/wan/Kconfig"



















source "drivers/net/ieee802154/Kconfig"