Commit 9013196a authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

Merge branch 'sched/urgent'

parents 2a0a24eb 39f23ce0

Documentation/admin-guide/device-mapper/dm-integrity.rst

+9 −6
Original line number Diff line number Diff line
@@ -182,12 +182,15 @@ fix_padding 
	space-efficient. If this option is not present, large padding is

	used - that is for compatibility with older kernels.





The journal mode (D/J), buffer_sectors, journal_watermark, commit_time can

be changed when reloading the target (load an inactive table and swap the

tables with suspend and resume). The other arguments should not be changed

when reloading the target because the layout of disk data depend on them

and the reloaded target would be non-functional.

allow_discards

	Allow block discard requests (a.k.a. TRIM) for the integrity device.

	Discards are only allowed to devices using internal hash.



The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and

allow_discards can be changed when reloading the target (load an inactive

table and swap the tables with suspend and resume). The other arguments

should not be changed when reloading the target because the layout of disk

data depend on them and the reloaded target would be non-functional.





The layout of the formatted block device:

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/dma/socionext,uniphier-xdmac.yaml

+3 −4
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ properties: 
    const: socionext,uniphier-xdmac



  reg:

    items:

      - description: XDMAC base register region (offset and length)

      - description: XDMAC extension register region (offset and length)

    maxItems: 1



  interrupts:

    maxItems: 1
@@ -49,12 +47,13 @@ required: 
  - reg

  - interrupts

  - "#dma-cells"

  - dma-channels



examples:

  - |

    xdmac: dma-controller@5fc10000 {

        compatible = "socionext,uniphier-xdmac";

        reg = <0x5fc10000 0x1000>, <0x5fc20000 0x800>;

        reg = <0x5fc10000 0x5300>;

        interrupts = <0 188 4>;

        #dma-cells = <2>;

        dma-channels = <16>;

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