Commit 6f00a54c authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge tag 'v5.6-rc5' into rdma.git for-next 



Required due to dependencies in following patches.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents 3e3cf2e8 2c523b34

.gitignore

+0 −4
Original line number Diff line number Diff line
@@ -100,10 +100,6 @@ modules.order 
/include/ksym/

/arch/*/include/generated/



# Generated lkdtm tests

/tools/testing/selftests/lkdtm/*.sh

!/tools/testing/selftests/lkdtm/run.sh



# stgit generated dirs

patches-*

Documentation/devicetree/bindings/arm/arm,scmi.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ Required sub-node properties: 
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

[2] Documentation/devicetree/bindings/power/power-domain.yaml

[3] Documentation/devicetree/bindings/thermal/thermal.txt

[4] Documentation/devicetree/bindings/sram/sram.txt

[4] Documentation/devicetree/bindings/sram/sram.yaml

[5] Documentation/devicetree/bindings/reset/reset.txt



Example:

Documentation/devicetree/bindings/arm/arm,scpi.txt

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ Required properties: 
[0] http://infocenter.arm.com/help/topic/com.arm.doc.dui0922b/index.html

[1] Documentation/devicetree/bindings/clock/clock-bindings.txt

[2] Documentation/devicetree/bindings/thermal/thermal.txt

[3] Documentation/devicetree/bindings/sram/sram.txt

[3] Documentation/devicetree/bindings/sram/sram.yaml

[4] Documentation/devicetree/bindings/power/power-domain.yaml



Example:

Documentation/devicetree/bindings/arm/bcm/brcm,bcm63138.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Timer node: 


Syscon reboot node:



See Documentation/devicetree/bindings/power/reset/syscon-reboot.txt for the

See Documentation/devicetree/bindings/power/reset/syscon-reboot.yaml for the

detailed list of properties, the two values defined below are specific to the

BCM6328-style timer:

Documentation/devicetree/bindings/arm/cpus.yaml

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ properties: 
    $ref: '/schemas/types.yaml#/definitions/phandle-array'

    description: |

      List of phandles to idle state nodes supported

      by this cpu (see ./idle-states.txt).

      by this cpu (see ./idle-states.yaml).



  capacity-dmips-mhz:

    $ref: '/schemas/types.yaml#/definitions/uint32'