Commit d31e9558 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



The only slightly tricky merge conflict was the netdevsim because the
mutex locking fix overlapped a lot of driver reload reorganization.

The rest were (relatively) trivial in nature.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c23fcbbc 1204c70d

.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

+6 −1
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ stable kernels. 
| ARM            | MMU-500         | #841119,826419  | N/A                         |

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

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

| Broadcom       | Brahma-B53      | N/A             | ARM64_ERRATUM_845719        |

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

| Broadcom       | Brahma-B53      | N/A             | ARM64_ERRATUM_843419        |

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

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

| Cavium         | ThunderX ITS    | #22375,24313    | CAVIUM_ERRATUM_22375        |

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

| Cavium         | ThunderX ITS    | #23144          | CAVIUM_ERRATUM_23144        |
@@ -126,7 +131,7 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |

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

| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |

| Qualcomm Tech. | Kryo/Falkor v1  | E1009           | QCOM_FALKOR_ERRATUM_1009    |

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

| Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |

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

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).

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml

+3 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/allwinner,sun4i-a10-csi.yaml#

$id: http://devicetree.org/schemas/media/allwinner,sun4i-a10-csi.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Allwinner A10 CMOS Sensor Interface (CSI) Device Tree Bindings
@@ -27,14 +27,12 @@ properties: 
  clocks:

    items:

      - description: The CSI interface clock

      - description: The CSI module clock

      - description: The CSI ISP clock

      - description: The CSI DRAM clock



  clock-names:

    items:

      - const: bus

      - const: mod

      - const: isp

      - const: ram
@@ -89,9 +87,8 @@ examples: 
        compatible = "allwinner,sun7i-a20-csi0";

        reg = <0x01c09000 0x1000>;

        interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>,

                 <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>;

        clock-names = "bus", "mod", "isp", "ram";

        clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>;

        clock-names = "bus", "isp", "ram";

        resets = <&ccu RST_CSI0>;



        port {

CRA Git | Maintained and supported by SUSTech CRA and CCSE