Commit 3297e554 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up fixes from perf/urgent.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 36c84190 8013d1d3

Documentation/arm64/memory-tagging-extension.rst

+2 −2
Original line number Diff line number Diff line
@@ -228,10 +228,10 @@ Core dump support 
-----------------



The allocation tags for user memory mapped with ``PROT_MTE`` are dumped

in the core file as additional ``PT_ARM_MEMTAG_MTE`` segments. The

in the core file as additional ``PT_AARCH64_MEMTAG_MTE`` segments. The

program header for such segment is defined as:



:``p_type``: ``PT_ARM_MEMTAG_MTE``

:``p_type``: ``PT_AARCH64_MEMTAG_MTE``

:``p_flags``: 0

:``p_offset``: segment file offset

:``p_vaddr``: segment virtual address, same as the corresponding

Documentation/devicetree/bindings/clock/microchip,mpfs.yaml

+11 −2
Original line number Diff line number Diff line
@@ -22,7 +22,16 @@ properties: 
    const: microchip,mpfs-clkcfg



  reg:

    maxItems: 1

    items:

      - description: |

          clock config registers:

          These registers contain enable, reset & divider tables for the, cpu,

          axi, ahb and rtc/mtimer reference clocks as well as enable and reset

          for the peripheral clocks.

      - description: |

          mss pll dri registers:

          Block of registers responsible for dynamic reconfiguration of the mss

          pll



  clocks:

    maxItems: 1
@@ -51,7 +60,7 @@ examples: 
            #size-cells = <2>;

            clkcfg: clock-controller@20002000 {

                compatible = "microchip,mpfs-clkcfg";

                reg = <0x0 0x20002000 0x0 0x1000>;

                reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;

                clocks = <&ref>;

                #clock-cells = <1>;

        };

Documentation/devicetree/bindings/mfd/atmel-flexcom.txt

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ flexcom@f8034000 { 
		clock-names = "spi_clk";

		atmel,fifo-size = <32>;



		mtd_dataflash@0 {

		flash@0 {

			compatible = "atmel,at25f512b";

			reg = <0>;

			spi-max-frequency = <20000000>;

Documentation/devicetree/bindings/net/dsa/realtek.yaml

+14 −21
Original line number Diff line number Diff line
@@ -27,32 +27,25 @@ description: 
  The realtek-mdio driver is an MDIO driver and it must be inserted inside

  an MDIO node.



  The compatible string is only used to identify which (silicon) family the

  switch belongs to. Roughly speaking, a family is any set of Realtek switches

  whose chip identification register(s) have a common location and semantics.

  The different models in a given family can be automatically disambiguated by

  parsing the chip identification register(s) according to the given family,

  avoiding the need for a unique compatible string for each model.



properties:

  compatible:

    enum:

      - realtek,rtl8365mb

      - realtek,rtl8366

      - realtek,rtl8366rb

      - realtek,rtl8366s

      - realtek,rtl8367

      - realtek,rtl8367b

      - realtek,rtl8367rb

      - realtek,rtl8367s

      - realtek,rtl8368s

      - realtek,rtl8369

      - realtek,rtl8370

    description: |

      realtek,rtl8365mb: 4+1 ports

      realtek,rtl8366: 5+1 ports

      realtek,rtl8366rb: 5+1 ports

      realtek,rtl8366s: 5+1 ports

      realtek,rtl8367:

      realtek,rtl8367b:

      realtek,rtl8367rb: 5+2 ports

      realtek,rtl8367s: 5+2 ports

      realtek,rtl8368s: 8 ports

      realtek,rtl8369: 8+1 ports

      realtek,rtl8370: 8+2 ports

      realtek,rtl8365mb:

        Use with models RTL8363NB, RTL8363NB-VB, RTL8363SC, RTL8363SC-VB,

        RTL8364NB, RTL8364NB-VB, RTL8365MB, RTL8366SC, RTL8367RB-VB, RTL8367S,

        RTL8367SB, RTL8370MB, RTL8310SR

      realtek,rtl8366rb:

        Use with models RTL8366RB, RTL8366S



  mdc-gpios:

    description: GPIO line for the MDC clock line.
@@ -335,7 +328,7 @@ examples: 
            #size-cells = <0>;



            switch@29 {

                    compatible = "realtek,rtl8367s";

                    compatible = "realtek,rtl8365mb";

                    reg = <29>;



                    reset-gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;

Documentation/devicetree/bindings/regulator/richtek,rt5190a-regulator.yaml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ properties: 
        type: object

        $ref: regulator.yaml#

        description: |

          regulator description for buck1 and buck4.

          regulator description for buck1 to buck4, and ldo.



        properties:

          regulator-allowed-modes: