Commit de1528ee authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus 



Unification of 5.12-devel branches.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 0d3070f5 15447b64

CREDITS

+24 −0
Original line number Diff line number Diff line
@@ -710,6 +710,10 @@ S: Las Cuevas 2385 - Bo Guemes 
S: Las Heras, Mendoza CP 5539

S: Argentina



N: Jay Cliburn

E: jcliburn@gmail.com

D: ATLX Ethernet drivers



N: Steven P. Cole

E: scole@lanl.gov

E: elenstev@mesatop.com
@@ -1284,6 +1288,10 @@ D: Major kbuild rework during the 2.5 cycle 
D: ISDN Maintainer

S: USA



N: Gerrit Renker

E: gerrit@erg.abdn.ac.uk

D: DCCP protocol support.



N: Philip Gladstone

E: philip@gladstonefamily.net

D: Kernel / timekeeping stuff
@@ -2138,6 +2146,10 @@ E: seasons@falcon.sch.bme.hu 
E: seasons@makosteszta.sote.hu

D: Original author of software suspend



N: Alexey Kuznetsov

E: kuznet@ms2.inr.ac.ru

D: Author and maintainer of large parts of the networking stack



N: Jaroslav Kysela

E: perex@perex.cz

W: https://www.perex.cz
@@ -2696,6 +2708,10 @@ N: Wolfgang Muees 
E: wolfgang@iksw-muees.de

D: Auerswald USB driver



N: Shrijeet Mukherjee

E: shrijeet@gmail.com

D: Network routing domains (VRF).



N: Paul Mundt

E: paul.mundt@gmail.com

D: SuperH maintainer
@@ -4110,6 +4126,10 @@ S: B-1206 Jingmao Guojigongyu 
S: 16 Baliqiao Nanjie, Beijing 101100

S: People's Repulic of China



N: Aviad Yehezkel

E: aviadye@nvidia.com

D: Kernel TLS implementation and offload support.



N: Victor Yodaiken

E: yodaiken@fsmlabs.com

D: RTLinux (RealTime Linux)
@@ -4167,6 +4187,10 @@ S: 1507 145th Place SE #B5 
S: Bellevue, Washington 98007

S: USA



N: Wensong Zhang

E: wensong@linux-vs.org

D: IP virtual server (IPVS).



N: Haojian Zhuang

E: haojian.zhuang@gmail.com

D: MMP support

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -5972,6 +5972,10 @@ 
			This option is obsoleted by the "nopv" option, which

			has equivalent effect for XEN platform.



	xen_no_vector_callback

			[KNL,X86,XEN] Disable the vector callback for Xen

			event channel interrupts.



	xen_scrub_pages=	[XEN]

			Boolean option to control scrubbing pages before giving them back

			to Xen, for use by other domains. Can be also changed at runtime

Documentation/devicetree/bindings/net/renesas,etheravb.yaml

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ allOf: 
            enum:

              - renesas,etheravb-r8a774a1

              - renesas,etheravb-r8a774b1

              - renesas,etheravb-r8a774e1

              - renesas,etheravb-r8a7795

              - renesas,etheravb-r8a7796

              - renesas,etheravb-r8a77961

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+6 −2
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ properties: 
            * snps,route-dcbcp, DCB Control Packets

            * snps,route-up, Untagged Packets

            * snps,route-multi-broad, Multicast & Broadcast Packets

          * snps,priority, RX queue priority (Range 0x0 to 0xF)

          * snps,priority, bitmask of the tagged frames priorities assigned to

            the queue



  snps,mtl-tx-config:

    $ref: /schemas/types.yaml#/definitions/phandle
@@ -188,7 +189,10 @@ properties: 
            * snps,idle_slope, unlock on WoL

            * snps,high_credit, max write outstanding req. limit

            * snps,low_credit, max read outstanding req. limit

          * snps,priority, TX queue priority (Range 0x0 to 0xF)

          * snps,priority, bitmask of the priorities assigned to the queue.

            When a PFC frame is received with priorities matching the bitmask,

            the queue is blocked from transmitting for the pause time specified

            in the PFC frame.



  snps,reset-gpio:

    deprecated: true

Documentation/firmware-guide/acpi/apei/einj.rst

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ The following files belong to it: 
  0x00000010        Memory Uncorrectable non-fatal

  0x00000020        Memory Uncorrectable fatal

  0x00000040        PCI Express Correctable

  0x00000080        PCI Express Uncorrectable fatal

  0x00000100        PCI Express Uncorrectable non-fatal

  0x00000080        PCI Express Uncorrectable non-fatal

  0x00000100        PCI Express Uncorrectable fatal

  0x00000200        Platform Correctable

  0x00000400        Platform Uncorrectable non-fatal

  0x00000800        Platform Uncorrectable fatal