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

Merge 5.4-rc5 into char-misc-next 



We want the binder fix in here as well for testing and to work on top
of.

Also handles a merge issue in binder.c to help linux-next out

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 6859eba4 d6d5df1d

.mailmap

+3 −1
Original line number Diff line number Diff line
@@ -196,7 +196,8 @@ Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de> 
Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>

Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Patrick Mochel <mochel@digitalimplant.org>

Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>

Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>

Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>

Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter@oruba.de>

Peter Oruba <peter.oruba@amd.com>
@@ -229,6 +230,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> 
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>

Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>

Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX2 SMMUv3| #126            | N/A                         |

+----------------+-----------------+-----------------+-----------------------------+

| Cavium         | ThunderX2 Core  | #219            | CAVIUM_TX2_ERRATUM_219      |

+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+

| Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585         |

+----------------+-----------------+-----------------+-----------------------------+

Documentation/dev-tools/kasan.rst

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ smaller binary while the latter is 1.1 - 2 times faster. 
Both KASAN modes work with both SLUB and SLAB memory allocators.

For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.



To augment reports with last allocation and freeing stack of the physical page,

it is recommended to enable also CONFIG_PAGE_OWNER and boot with page_owner=on.



To disable instrumentation for specific files or directories, add a line

similar to the following to the respective kernel Makefile:

Documentation/devicetree/bindings/arm/rockchip.yaml

+2 −2
Original line number Diff line number Diff line
@@ -496,12 +496,12 @@ properties: 


      - description: Theobroma Systems RK3368-uQ7 with Haikou baseboard

        items:

          - const: tsd,rk3368-uq7-haikou

          - const: tsd,rk3368-lion-haikou

          - const: rockchip,rk3368



      - description: Theobroma Systems RK3399-Q7 with Haikou baseboard

        items:

          - const: tsd,rk3399-q7-haikou

          - const: tsd,rk3399-puma-haikou

          - const: rockchip,rk3399



      - description: Tronsmart Orion R68 Meta

Documentation/devicetree/bindings/interrupt-controller/atmel,aic.txt

+5 −2
Original line number Diff line number Diff line 
* Advanced Interrupt Controller (AIC)



Required properties:

- compatible: Should be "atmel,<chip>-aic"

  <chip> can be "at91rm9200", "sama5d2", "sama5d3" or "sama5d4"

- compatible: Should be:

    - "atmel,<chip>-aic" where  <chip> can be "at91rm9200", "sama5d2",

      "sama5d3" or "sama5d4"

    - "microchip,<chip>-aic" where <chip> can be "sam9x60"



- interrupt-controller: Identifies the node as an interrupt controller.

- #interrupt-cells: The number of cells to define the interrupts. It should be 3.

  The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet).

CRA Git | Maintained and supported by SUSTech CRA and CCSE