Commit 4c201d58 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge tag 'v5.7-rc7' into x86/amd 

Linux 5.7-rc7
parents 555fb5ae 9cb1fd0e

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Will Deacon <will@kernel.org> <will.deacon@arm.com>

Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>

Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/core-api/printk-formats.rst

+14 −0
Original line number Diff line number Diff line
@@ -112,6 +112,20 @@ used when printing stack backtraces. The specifier takes into 
consideration the effect of compiler optimisations which may occur

when tail-calls are used and marked with the noreturn GCC attribute.



Probed Pointers from BPF / tracing

----------------------------------



::



	%pks	kernel string

	%pus	user string



The ``k`` and ``u`` specifiers are used for printing prior probed memory from

either kernel memory (k) or user memory (u). The subsequent ``s`` specifier

results in printing a string. For direct use in regular vsnprintf() the (k)

and (u) annotation is ignored, however, when used out of BPF's bpf_trace_printk(),

for example, it reads the memory it is pointing to without faulting.



Kernel Pointers

---------------

Documentation/devicetree/bindings/dma/fsl-edma.txt

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ Required properties: 
- compatible :

	- "fsl,vf610-edma" for eDMA used similar to that on Vybrid vf610 SoC

	- "fsl,imx7ulp-edma" for eDMA2 used similar to that on i.mx7ulp

	- "fsl,fsl,ls1028a-edma" for eDMA used similar to that on Vybrid vf610 SoC

	- "fsl,ls1028a-edma" followed by "fsl,vf610-edma" for eDMA used on the

	  LS1028A SoC.

- reg : Specifies base physical address(s) and size of the eDMA registers.

	The 1st region is eDMA control register's address and size.

	The 2nd and the 3rd regions are programmable channel multiplexing

Documentation/devicetree/bindings/net/dsa/b53.txt

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ Ethernet switch connected via MDIO to the host, CPU port wired to eth0: 
			#size-cells = <0>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				port0@0 {

					reg = <0>;

					label = "lan1";

Documentation/networking/devlink/ice.rst

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ The ``ice`` driver reports the following versions 
      - running

      - ICE OS Default Package

      - The name of the DDP package that is active in the device. The DDP

        package is loaded by the driver during initialization. Each varation

        of DDP package shall have a unique name.

        package is loaded by the driver during initialization. Each

        variation of the DDP package has a unique name.

    * - ``fw.app``

      - running

      - 1.3.1.0