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

Merge 6.2-rc5 into tty-next 



We need the serial/tty changes into this branch as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 05e2600c 2241ab53

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com> 
Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>

Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>

Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>

Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>

Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>

Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>

Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>

Documentation/admin-guide/mm/zswap.rst

+1 −3
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ e.g. ``zswap.zpool=zbud``. It can also be changed at runtime using the sysfs 
The zbud type zpool allocates exactly 1 page to store 2 compressed pages, which

means the compression ratio will always be 2:1 or worse (because of half-full

zbud pages).  The zsmalloc type zpool has a more complex compressed page

storage method, and it can achieve greater storage densities.  However,

zsmalloc does not implement compressed page eviction, so once zswap fills it

cannot evict the oldest page, it can only reject new pages.

storage method, and it can achieve greater storage densities.



When a swap page is passed from frontswap to zswap, zswap maintains a mapping

of the swap entry, a combination of the swap type and swap offset, to the zpool

Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml

+23 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ allOf: 
              - qcom,msm8939-pcnoc

              - qcom,msm8939-snoc

              - qcom,msm8996-a1noc

              - qcom,msm8996-a2noc

              - qcom,msm8996-bimc

              - qcom,msm8996-cnoc

              - qcom,msm8996-pnoc
@@ -186,6 +185,29 @@ allOf: 
      required:

        - power-domains



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-a2noc



    then:

      properties:

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: aggre2_ufs_axi

            - const: ufs_axi



        clocks:

          items:

            - description: Bus Clock

            - description: Bus A Clock

            - description: Aggregate2 NoC UFS AXI Clock

            - description: UFS AXI Clock



  - if:

      properties:

        compatible:

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb2-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb2-phy.yaml#"

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



title: Amlogic G12A USB2 PHY
@@ -13,8 +13,8 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb2-phy

      - amlogic,meson-a1-usb2-phy

      - amlogic,g12a-usb2-phy

      - amlogic,a1-usb2-phy



  reg:

    maxItems: 1
@@ -68,7 +68,7 @@ additionalProperties: false 
examples:

  - |

    phy@36000 {

          compatible = "amlogic,meson-g12a-usb2-phy";

          compatible = "amlogic,g12a-usb2-phy";

          reg = <0x36000 0x2000>;

          clocks = <&xtal>;

          clock-names = "xtal";

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#"

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



title: Amlogic G12A USB3 + PCIE Combo PHY
@@ -13,7 +13,7 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb3-pcie-phy

      - amlogic,g12a-usb3-pcie-phy



  reg:

    maxItems: 1
@@ -49,7 +49,7 @@ additionalProperties: false 
examples:

  - |

    phy@46000 {

          compatible = "amlogic,meson-g12a-usb3-pcie-phy";

          compatible = "amlogic,g12a-usb3-pcie-phy";

          reg = <0x46000 0x2000>;

          clocks = <&ref_clk>;

          clock-names = "ref_clk";