Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a811462 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.3-rc7 into usb-next 



We need the usb fixes in here for testing

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 96e46dcf 089cf7f6

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>
@@ -160,6 +163,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co 
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>

Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>

Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>

Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <m@bues.ch>

Michel Dänzer <michel@tungstengraphics.com>

Documentation/PCI/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Linux PCI Bus Subsystem 
   :numbered:



   pci

   picebus-howto

   pciebus-howto

   pci-iov-howto

   msi-howto

   acpi-info

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -4090,6 +4090,13 @@ 
			Run specified binary instead of /init from the ramdisk,

			used for early userspace startup. See initrd.



	rdrand=		[X86]

			force - Override the decision by the kernel to hide the

				advertisement of RDRAND support (this affects

				certain AMD processors because of buggy BIOS

				support, specifically around the suspend/resume

				path).



	rdt=		[HW,X86,RDT]

			Turn on/off individual RDT features. List is:

			cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,

Documentation/admin-guide/sysctl/net.rst

+1 −28
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ Table : Subdirectories in /proc/sys/net 
 802       E802 protocol         ax25       AX25

 ethernet  Ethernet protocol     rose       X.25 PLP layer

 ipv4      IP version 4          x25        X.25 protocol

 ipx       IPX                   token-ring IBM token ring

 bridge    Bridging              decnet     DEC net

 ipv6      IP version 6          tipc       TIPC

 ========= =================== = ========== ==================
@@ -401,33 +400,7 @@ interface. 
(network) that the route leads to, the router (may be directly connected), the

route flags, and the device the route is using.





5. IPX

------



The IPX protocol has no tunable values in proc/sys/net.



The IPX  protocol  does,  however,  provide  proc/net/ipx. This lists each IPX

socket giving  the  local  and  remote  addresses  in  Novell  format (that is

network:node:port). In  accordance  with  the  strange  Novell  tradition,

everything but the port is in hex. Not_Connected is displayed for sockets that

are not  tied to a specific remote address. The Tx and Rx queue sizes indicate

the number  of  bytes  pending  for  transmission  and  reception.  The  state

indicates the  state  the  socket  is  in and the uid is the owning uid of the

socket.



The /proc/net/ipx_interface  file lists all IPX interfaces. For each interface

it gives  the network number, the node number, and indicates if the network is

the primary  network.  It  also  indicates  which  device  it  is bound to (or

Internal for  internal  networks)  and  the  Frame  Type if appropriate. Linux

supports 802.3,  802.2,  802.2  SNAP  and DIX (Blue Book) ethernet framing for

IPX.



The /proc/net/ipx_route  table  holds  a list of IPX routes. For each route it

gives the  destination  network, the router node (or Directly) and the network

address of the router (or Connected) for internal networks.



6. TIPC

5. TIPC

-------



tipc_rmem