Commit e9cbc890 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR.

No conflicts.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents f30e5323 27bbf45e

Documentation/networking/ax25.rst

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ AX.25 
To use the amateur radio protocols within Linux you will need to get a

suitable copy of the AX.25 Utilities. More detailed information about

AX.25, NET/ROM and ROSE, associated programs and utilities can be

found on http://www.linux-ax25.org.

found on https://linux-ax25.in-berlin.de.



There is an active mailing list for discussing Linux amateur radio matters

There is a mailing list for discussing Linux amateur radio matters

called linux-hams@vger.kernel.org. To subscribe to it, send a message to

majordomo@vger.kernel.org with the words "subscribe linux-hams" in the body

of the message, the subject field is ignored.  You don't need to be

Documentation/process/embargoed-hardware-issues.rst

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ an involved disclosed party. The current ambassadors list: 
  IBM Z		Christian Borntraeger <borntraeger@de.ibm.com>

  Intel		Tony Luck <tony.luck@intel.com>

  Qualcomm	Trilok Soni <tsoni@codeaurora.org>

  RISC-V	Palmer Dabbelt <palmer@dabbelt.com>

  Samsung	Javier González <javier.gonz@samsung.com>



  Microsoft	James Morris <jamorris@linux.microsoft.com>

Documentation/sound/designs/midi-2.0.rst

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ topology based on those information. When the device is older and 
doesn't respond to the new UMP inquiries, the driver falls back and

builds the topology based on Group Terminal Block (GTB) information

from the USB descriptor.  Some device might be screwed up by the

unexpected UMP command; in such a case, pass `midi2_probe=0` option to

snd-usb-audio driver for skipping the UMP v1.1 inquiries.

unexpected UMP command; in such a case, pass `midi2_ump_probe=0`

option to snd-usb-audio driver for skipping the UMP v1.1 inquiries.



When the MIDI 2.0 device is probed, the kernel creates a rawmidi

device for each UMP Endpoint of the device.  Its device name is

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -3344,7 +3344,7 @@ AX.25 NETWORK LAYER 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-hams@vger.kernel.org

S:	Maintained

W:	http://www.linux-ax25.org/

W:	https://linux-ax25.in-berlin.de

F:	include/net/ax25.h

F:	include/uapi/linux/ax25.h

F:	net/ax25/
@@ -14769,7 +14769,7 @@ NETROM NETWORK LAYER 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-hams@vger.kernel.org

S:	Maintained

W:	http://www.linux-ax25.org/

W:	https://linux-ax25.in-berlin.de

F:	include/net/netrom.h

F:	include/uapi/linux/netrom.h

F:	net/netrom/
@@ -18620,7 +18620,7 @@ ROSE NETWORK LAYER 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-hams@vger.kernel.org

S:	Maintained

W:	http://www.linux-ax25.org/

W:	https://linux-ax25.in-berlin.de

F:	include/net/rose.h

F:	include/uapi/linux/rose.h

F:	net/rose/

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 6

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Hurr durr I'ma ninja sloth



# *DOCUMENTATION*