Commit 64edfa65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-deletions' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next 

Pull networking deletions from Jakub Kicinski:
 "Delete some obsolete networking code

  Old code like amateur radio and NFC have long been a burden to core
  networking developers. syzbot loves to find bugs in BKL-era code, and
  noobs try to fix them.

  If we want to have a fighting chance of surviving the LLM-pocalypse
  this code needs to find a dedicated owner or get deleted. We've talked
  about these deletions multiple times in the past and every time
  someone wanted the code to stay. It is never very clear to me how many
  of those people actually use the code vs are just nostalgic to see it
  go. Amateur radio did have occasional users (or so I think) but most
  users switched to user space implementations since its all super slow
  stuff. Nobody stepped up to maintain the kernel code.

  We were lucky enough to find someone who wants to help with NFC so
  we're giving that a chance. Let's try to put the rest of this code
  behind us"

* tag 'net-deletions' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next:
  drivers: net: 8390: wd80x3: Remove this driver
  drivers: net: 8390: ultra: Remove this driver
  drivers: net: 8390: AX88190: Remove this driver
  drivers: net: fujitsu: fmvj18x: Remove this driver
  drivers: net: smsc: smc91c92: Remove this driver
  drivers: net: smsc: smc9194: Remove this driver
  drivers: net: amd: nmclan: Remove this driver
  drivers: net: amd: lance: Remove this driver
  drivers: net: 3com: 3c589: Remove this driver
  drivers: net: 3com: 3c574: Remove this driver
  drivers: net: 3com: 3c515: Remove this driver
  drivers: net: 3com: 3c509: Remove this driver
  net: packetengines: remove obsolete yellowfin driver and vendor dir
  net: packetengines: remove obsolete hamachi driver
  net: remove unused ATM protocols and legacy ATM device drivers
  net: remove ax25 and amateur radio (hamradio) subsystem
  net: remove ISDN subsystem and Bluetooth CMTP
  caif: remove CAIF NETWORK LAYER
parents 82138f01 0c22ed0f

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -3652,6 +3652,11 @@ S: Dag Hammerskjolds v. 3E 
S: S-226 64 LUND

S: Sweden



N: Tilman Schmidt

E: tilman@imap.cc

D: Siemens Gigaset ISDN driver author and maintainer

D: ISDN CAPI subsystem contributions



N: Henning P. Schmiedehausen

E: hps@tanstaafl.de

D: added PCI support to the serial driver

Documentation/.renames.txt

+0 −6
Original line number Diff line number Diff line
@@ -783,11 +783,9 @@ namespaces/compatibility-list admin-guide/namespaces/compatibility-list 
namespaces/index admin-guide/namespaces/index

namespaces/resource-control admin-guide/namespaces/resource-control

networking/altera_tse networking/device_drivers/ethernet/altera/altera_tse

networking/baycom networking/device_drivers/hamradio/baycom

networking/bpf_flow_dissector bpf/prog_flow_dissector

networking/cxacru networking/device_drivers/atm/cxacru

networking/defza networking/device_drivers/fddi/defza

networking/device_drivers/3com/3c509 networking/device_drivers/ethernet/3com/3c509

networking/device_drivers/3com/vortex networking/device_drivers/ethernet/3com/vortex

networking/device_drivers/amazon/ena networking/device_drivers/ethernet/amazon/ena

networking/device_drivers/aquantia/atlantic networking/device_drivers/ethernet/aquantia/atlantic
@@ -822,7 +820,6 @@ networking/device_drivers/microsoft/netvsc networking/device_drivers/ethernet/mi 
networking/device_drivers/netronome/nfp networking/device_drivers/ethernet/netronome/nfp

networking/device_drivers/pensando/ionic networking/device_drivers/ethernet/pensando/ionic

networking/device_drivers/qualcomm/rmnet networking/device_drivers/cellular/qualcomm/rmnet

networking/device_drivers/smsc/smc9 networking/device_drivers/ethernet/smsc/smc9

networking/device_drivers/stmicro/stmmac networking/device_drivers/ethernet/stmicro/stmmac

networking/device_drivers/ti/cpsw networking/device_drivers/ethernet/ti/cpsw

networking/device_drivers/ti/cpsw_switchdev networking/device_drivers/ethernet/ti/cpsw_switchdev
@@ -836,19 +833,16 @@ networking/e100 networking/device_drivers/ethernet/intel/e100 
networking/e1000 networking/device_drivers/ethernet/intel/e1000

networking/e1000e networking/device_drivers/ethernet/intel/e1000e

networking/fm10k networking/device_drivers/ethernet/intel/fm10k

networking/fore200e networking/device_drivers/atm/fore200e

networking/hinic networking/device_drivers/ethernet/huawei/hinic

networking/i40e networking/device_drivers/ethernet/intel/i40e

networking/iavf networking/device_drivers/ethernet/intel/iavf

networking/ice networking/device_drivers/ethernet/intel/ice

networking/igb networking/device_drivers/ethernet/intel/igb

networking/igbvf networking/device_drivers/ethernet/intel/igbvf

networking/iphase networking/device_drivers/atm/iphase

networking/ixgbe networking/device_drivers/ethernet/intel/ixgbe

networking/ixgbevf networking/device_drivers/ethernet/intel/ixgbevf

networking/netdev-FAQ process/maintainer-netdev

networking/skfp networking/device_drivers/fddi/skfp

networking/z8530drv networking/device_drivers/hamradio/z8530drv

nfc/index driver-api/nfc/index

nfc/nfc-hci driver-api/nfc/nfc-hci

nfc/nfc-pn544 driver-api/nfc/nfc-pn544

Documentation/admin-guide/kernel-parameters.txt

+0 −18
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
	APPARMOR AppArmor support is enabled.

	ARM	ARM architecture is enabled.

	ARM64	ARM64 architecture is enabled.

	AX25	Appropriate AX.25 support is enabled.

	CLK	Common clock infrastructure is enabled.

	CMA	Contiguous Memory Area support is enabled.

	DRM	Direct Rendering Management support is enabled.
@@ -633,23 +632,6 @@ Kernel parameters 
			1 - Enable the BAU.

			unset - Disable the BAU.



	baycom_epp=	[HW,AX25]

			Format: <io>,<mode>



	baycom_par=	[HW,AX25] BayCom Parallel Port AX.25 Modem

			Format: <io>,<mode>

			See header of drivers/net/hamradio/baycom_par.c.



	baycom_ser_fdx=	[HW,AX25]

			BayCom Serial Port AX.25 Modem (Full Duplex Mode)

			Format: <io>,<irq>,<mode>[,<baud>]

			See header of drivers/net/hamradio/baycom_ser_fdx.c.



	baycom_ser_hdx=	[HW,AX25]

			BayCom Serial Port AX.25 Modem (Half Duplex Mode)

			Format: <io>,<irq>,<mode>

			See header of drivers/net/hamradio/baycom_ser_hdx.c.



	bdev_allow_write_mounted=

			Format: <bool>

			Control the ability to open a mounted block device

Documentation/isdn/credits.rst

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
=======

Credits

=======





I want to thank all who contributed to this project and especially to:

(in alphabetical order)



Thomas Bogendörfer (tsbogend@bigbug.franken.de)

  Tester, lots of bugfixes and hints.



Alan Cox (alan@lxorguk.ukuu.org.uk)

  For help getting into standard-kernel.



Henner Eisen (eis@baty.hanse.de)

  For X.25 implementation.



Volker Götz (volker@oops.franken.de)

  For contribution of man-pages, the imontty-tool and a perfect

  maintaining of the mailing-list at hub-wue.



Matthias Hessler (hessler@isdn4linux.de)

  For creating and maintaining the FAQ.



Bernhard Hailer (Bernhard.Hailer@lrz.uni-muenchen.de)

  For creating the FAQ, and the leafsite HOWTO.



Michael 'Ghandi' Herold (michael@abadonna.franken.de)

  For contribution of the vbox answering machine.



Michael Hipp (Michael.Hipp@student.uni-tuebingen.de)

  For his Sync-PPP-code.



Karsten Keil (keil@isdn4linux.de)

  For adding 1TR6-support to the Teles-driver.

  For the HiSax-driver.



Michael Knigge (knick@cove.han.de)

  For contributing the imon-tool



Andreas Kool (akool@Kool.f.EUnet.de)

  For contribution of the isdnlog/isdnrep-tool



Pedro Roque Marques (roque@di.fc.ul.pt)

  For lot of new ideas and the pcbit driver.



Eberhard Mönkeberg (emoenke@gwdg.de)

  For testing and help to get into kernel.



Thomas Neumann (tn@ruhr.de)

  For help with Cisco-SLARP and keepalive



Jan den Ouden (denouden@groovin.xs4all.nl)

  For contribution of the original teles-driver



Carsten Paeth (calle@calle.in-berlin.de)

  For the AVM-B1-CAPI2.0 driver



Thomas Pfeiffer (pfeiffer@pds.de)

  For V.110, extended T.70 and Hylafax extensions in isdn_tty.c



Max Riegel (riegel@max.franken.de)

  For making the ICN hardware-documentation and test-equipment available.



Armin Schindler (mac@melware.de)

  For the eicon active card driver.



Gerhard 'Fido' Schneider (fido@wuff.mayn.de)

  For heavy-duty-beta-testing with his BBS ;)



Thomas Uhl (uhl@think.de)

  For distributing the cards.

  For pushing me to work ;-)

Documentation/isdn/index.rst

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



====

ISDN

====



.. toctree::

   :maxdepth: 2



   interface_capi



   m_isdn



   credits