Merge tag 'devicetree-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

author Linus Torvalds <torvalds@linux-foundation.org>

Thu, 27 Apr 2023 16:23:57 +0000 (09:23 -0700)

committer Linus Torvalds <torvalds@linux-foundation.org>

Thu, 27 Apr 2023 16:23:57 +0000 (09:23 -0700)
author Linus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Apr 2023 16:23:57 +0000 (09:23 -0700)
committer Linus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Apr 2023 16:23:57 +0000 (09:23 -0700)
diff --combined Documentation/devicetree/bindings/arm/cpus.yaml

index e287dcaec2033142e836c53baee084bda77527d7,a9bbe2b74b5d8cb44a77de830e42efe7e8f4c3e1..ff272e517d574d3f91e96e47953e676b6ec07495
--- 1/Documentation/devicetree/bindings/arm/cpus.yaml
--- 2/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@@ -85,8 -85,6 +85,8 @@@ properties
   
     compatible:
       enum:
+ +      - apple,avalanche
+ +      - apple,blizzard
         - apple,icestorm
         - apple,firestorm
         - arm,arm710t
@@@ -141,6 -139,7 +141,7 @@@
         - arm,cortex-a77
         - arm,cortex-a78
         - arm,cortex-a78ae
+       - arm,cortex-a78c
         - arm,cortex-a510
         - arm,cortex-a710
         - arm,cortex-a715
@@@ -153,6 -152,7 +154,7 @@@
         - arm,cortex-r5
         - arm,cortex-r7
         - arm,cortex-x1
+       - arm,cortex-x1c
         - arm,cortex-x2
         - arm,cortex-x3
         - arm,neoverse-e1
diff --combined Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml

index f7d578a171a4f772e8b19505f7c89c0df22b9300,efcdc444941628c27fdcaec9ff4b8fd29932b894..28ded09d72e3dee39dd691d67bc216e11124ad1a
--- 1/Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml
--- 2/Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml
@@@ -1,8 -1,8 +1,8 @@@
   # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
   %YAML 1.2
   ---
- $id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mt7622-wed.yaml#"
- $schema: "http://devicetree.org/meta-schemas/core.yaml#"
+ $id: http://devicetree.org/schemas/arm/mediatek/mediatek,mt7622-wed.yaml#
+ $schema: http://devicetree.org/meta-schemas/core.yaml#
   
   title: MediaTek Wireless Ethernet Dispatch Controller for MT7622
   
@@@ -20,7 -20,6 +20,7 @@@ properties
       items:
         - enum:
             - mediatek,mt7622-wed
+ +          - mediatek,mt7981-wed
             - mediatek,mt7986-wed
         - const: syscon
   
diff --combined Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml

index 4f6ffb8182a93d430437edef11e70794f2f022be,286e726cd052b2d6b7f09d792ddcb98dd5e7605b..49304a1476abfa182e5d5daae3e07e56d9992251
--- 1/Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
--- 2/Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
+++ b/Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
@@@ -10,7 -10,7 +10,7 @@@ maintainers
     - Robin van der Gracht <robin@protonic.nl>
   
   allOf:
- -  - $ref: "/schemas/input/matrix-keymap.yaml#"
+ +  - $ref: /schemas/input/matrix-keymap.yaml#
   
   properties:
     compatible:
@@@ -72,7 -72,7 +72,7 @@@ examples
       #include <dt-bindings/interrupt-controller/irq.h>
       #include <dt-bindings/input/input.h>
       #include <dt-bindings/leds/common.h>
-     i2c1 {
+     i2c {
               #address-cells = <1>;
               #size-cells = <0>;
   
diff --combined Documentation/devicetree/bindings/cache/qcom,llcc.yaml

index 0000000000000000000000000000000000000000,14eb5175dac49ed44c6758fbd58d6d0afdea7654..d8b91944180ae1d03edd7fb99091bf7ccfe81b3c

mode 000000,100644..100644
--- /dev/null
--- 2/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
+++ b/Documentation/devicetree/bindings/cache/qcom,llcc.yaml
@@@ -1,0 -1,65 +1,168 @@@
- -  - Rishabh Bhatnagar <rishabhb@codeaurora.org>
- -  - Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
+ # SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
+ %YAML 1.2
+ ---
+ $id: http://devicetree.org/schemas/cache/qcom,llcc.yaml#
+ $schema: http://devicetree.org/meta-schemas/core.yaml#
+ 
+ title: Last Level Cache Controller
+ 
+ maintainers:
- -    items:
- -      - description: LLCC base register region
- -      - description: LLCC broadcast base register region
++  - Bjorn Andersson <andersson@kernel.org>
+ 
+ description: |
+   LLCC (Last Level Cache Controller) provides last level of cache memory in SoC,
+   that can be shared by multiple clients. Clients here are different cores in the
+   SoC, the idea is to minimize the local caches at the clients and migrate to
+   common pool of memory. Cache memory is divided into partitions called slices
+   which are assigned to clients. Clients can query the slice details, activate
+   and deactivate them.
+ 
+ properties:
+   compatible:
+     enum:
+       - qcom,sc7180-llcc
+       - qcom,sc7280-llcc
+       - qcom,sc8180x-llcc
+       - qcom,sc8280xp-llcc
+       - qcom,sdm845-llcc
+       - qcom,sm6350-llcc
++      - qcom,sm7150-llcc
+       - qcom,sm8150-llcc
+       - qcom,sm8250-llcc
+       - qcom,sm8350-llcc
+       - qcom,sm8450-llcc
+       - qcom,sm8550-llcc
+ 
+   reg:
- -    items:
- -      - const: llcc_base
- -      - const: llcc_broadcast_base
++    minItems: 2
++    maxItems: 9
+ 
+   reg-names:
- -    system-cache-controller@1100000 {
- -      compatible = "qcom,sdm845-llcc";
- -      reg = <0x1100000 0x200000>, <0x1300000 0x50000> ;
- -      reg-names = "llcc_base", "llcc_broadcast_base";
- -      interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
++    minItems: 2
++    maxItems: 9
+ 
+   interrupts:
+     maxItems: 1
+ 
+ required:
+   - compatible
+   - reg
+   - reg-names
+ 
++allOf:
++  - if:
++      properties:
++        compatible:
++          contains:
++            enum:
++              - qcom,sc7180-llcc
++              - qcom,sm6350-llcc
++    then:
++      properties:
++        reg:
++          items:
++            - description: LLCC0 base register region
++            - description: LLCC broadcast base register region
++        reg-names:
++          items:
++            - const: llcc0_base
++            - const: llcc_broadcast_base
++
++  - if:
++      properties:
++        compatible:
++          contains:
++            enum:
++              - qcom,sc7280-llcc
++    then:
++      properties:
++        reg:
++          items:
++            - description: LLCC0 base register region
++            - description: LLCC1 base register region
++            - description: LLCC broadcast base register region
++        reg-names:
++          items:
++            - const: llcc0_base
++            - const: llcc1_base
++            - const: llcc_broadcast_base
++
++  - if:
++      properties:
++        compatible:
++          contains:
++            enum:
++              - qcom,sc8180x-llcc
++              - qcom,sc8280xp-llcc
++    then:
++      properties:
++        reg:
++          items:
++            - description: LLCC0 base register region
++            - description: LLCC1 base register region
++            - description: LLCC2 base register region
++            - description: LLCC3 base register region
++            - description: LLCC4 base register region
++            - description: LLCC5 base register region
++            - description: LLCC6 base register region
++            - description: LLCC7 base register region
++            - description: LLCC broadcast base register region
++        reg-names:
++          items:
++            - const: llcc0_base
++            - const: llcc1_base
++            - const: llcc2_base
++            - const: llcc3_base
++            - const: llcc4_base
++            - const: llcc5_base
++            - const: llcc6_base
++            - const: llcc7_base
++            - const: llcc_broadcast_base
++
++  - if:
++      properties:
++        compatible:
++          contains:
++            enum:
++              - qcom,sdm845-llcc
++              - qcom,sm8150-llcc
++              - qcom,sm8250-llcc
++              - qcom,sm8350-llcc
++              - qcom,sm8450-llcc
++    then:
++      properties:
++        reg:
++          items:
++            - description: LLCC0 base register region
++            - description: LLCC1 base register region
++            - description: LLCC2 base register region
++            - description: LLCC3 base register region
++            - description: LLCC broadcast base register region
++        reg-names:
++          items:
++            - const: llcc0_base
++            - const: llcc1_base
++            - const: llcc2_base
++            - const: llcc3_base
++            - const: llcc_broadcast_base
++
+ additionalProperties: false
+ 
+ examples:
+   - |
+     #include <dt-bindings/interrupt-controller/arm-gic.h>
+ 
++    soc {
++        #address-cells = <2>;
++        #size-cells = <2>;
++
++        system-cache-controller@1100000 {
++            compatible = "qcom,sdm845-llcc";
++            reg = <0 0x01100000 0 0x50000>, <0 0x01180000 0 0x50000>,
++                <0 0x01200000 0 0x50000>, <0 0x01280000 0 0x50000>,
++                <0 0x01300000 0 0x50000>;
++            reg-names = "llcc0_base", "llcc1_base", "llcc2_base",
++                "llcc3_base", "llcc_broadcast_base";
++            interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
++        };
+     };
diff --combined Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml

index 8aa87b8c1b33018f3f2b9d228688852fb4b2b3ec,7737fbec482c75986ed52f534ee76310dd1acf4c..c752c8985a536e9868492223746170300aa5c8ad
--- 1/Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
--- 2/Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
+++ b/Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml
@@@ -37,7 -37,6 +37,7 @@@ properties
         - samsung,exynos850-cmu-cmgp
         - samsung,exynos850-cmu-core
         - samsung,exynos850-cmu-dpu
+ +      - samsung,exynos850-cmu-g3d
         - samsung,exynos850-cmu-hsi
         - samsung,exynos850-cmu-is
         - samsung,exynos850-cmu-mfcmscl
@@@ -170,24 -169,6 +170,24 @@@ allOf
               - const: oscclk
               - const: dout_dpu
   
+ +  - if:
+ +      properties:
+ +        compatible:
+ +          contains:
+ +            const: samsung,exynos850-cmu-g3d
+ +
+ +    then:
+ +      properties:
+ +        clocks:
+ +          items:
+ +            - description: External reference clock (26 MHz)
+ +            - description: G3D clock (from CMU_TOP)
+ +
+ +        clock-names:
+ +          items:
+ +            - const: oscclk
+ +            - const: dout_g3d_switch
+ +
     - if:
         properties:
           compatible:
@@@ -202,7 -183,7 +202,7 @@@
               - description: External RTC clock (32768 Hz)
               - description: CMU_HSI bus clock (from CMU_TOP)
               - description: SD card clock (from CMU_TOP)
-             - description: "USB 2.0 DRD clock (from CMU_TOP)"
+             - description: USB 2.0 DRD clock (from CMU_TOP)
   
           clock-names:
             items:
diff --combined Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml

index b42553ac505c5ebf7d0c6651476e7d5ea6176489,69bf1b41854eb2670f6bb8bda0d63955cde1d08d..a1ed1004651b9a8c13474d8a3cda153a4ae6d210
--- 1/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
--- 2/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
@@@ -2,8 -2,8 +2,8 @@@
   # Copyright 2019 Analogix Semiconductor, Inc.
   %YAML 1.2
   ---
- -$id: "http://devicetree.org/schemas/display/bridge/analogix,anx7625.yaml#"
- -$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+ +$id: http://devicetree.org/schemas/display/bridge/analogix,anx7625.yaml#
+ +$schema: http://devicetree.org/meta-schemas/core.yaml#
   
   title: Analogix ANX7625 SlimPort (4K Mobile HD Transmitter)
   
@@@ -16,8 -16,7 +16,7 @@@ description: 
   
   properties:
     compatible:
-     items:
-       - const: analogix,anx7625
+     const: analogix,anx7625
   
     reg:
       maxItems: 1
@@@ -134,7 -133,7 +133,7 @@@ examples
     - |
       #include <dt-bindings/gpio/gpio.h>
   
-     i2c0 {
+     i2c {
           #address-cells = <1>;
           #size-cells = <0>;
   
diff --combined Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml

index cdeb67bc05f044e6283b9cda1f8a91df79adc02e,0f61291d426801bff7cd36625777feda73c6525f..70ec70922c138d153252ff88dd4104b160509af7
--- 1/Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml
--- 2/Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml
@@@ -18,7 -18,7 +18,7 @@@ properties
       maxItems: 1
   
     edid-emulation:
- -    $ref: "/schemas/types.yaml#/definitions/uint32"
+ +    $ref: /schemas/types.yaml#/definitions/uint32
       description:
         The EDID emulation entry to use
         Value  Resolution  Description
@@@ -71,7 -71,7 +71,7 @@@ examples
     - |
       #include <dt-bindings/gpio/gpio.h>
   
-     i2c1 {
+     i2c {
         #address-cells = <1>;
         #size-cells = <0>;
   
diff --combined Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml

index bda86e6857f53d500c25908d7b65dde8f2b2da54,dc22bd5225236dda32429f95cc1e8cb74106599e..8c2a737237f21fa4bf96d5ce1b8aa6a8aa343c00
--- 1/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml
--- 2/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml
@@@ -21,16 -21,18 +21,15 @@@ description: 
   properties:
     compatible:
       oneOf:
-       - items:
-           - const: mediatek,mt8183-disp-ccorr
-       - items:
-           - const: mediatek,mt8192-disp-ccorr
+       - enum:
+           - mediatek,mt8183-disp-ccorr
+           - mediatek,mt8192-disp-ccorr
         - items:
             - enum:
+ +              - mediatek,mt8186-disp-ccorr
                 - mediatek,mt8188-disp-ccorr
                 - mediatek,mt8195-disp-ccorr
             - const: mediatek,mt8192-disp-ccorr
- -      - items:
- -          - enum:
- -              - mediatek,mt8186-disp-ccorr
- -          - const: mediatek,mt8192-disp-ccorr
   
     reg:
       maxItems: 1
diff --combined Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

index 4e98261f29489f07059f5eebe0e646b79732b1ef,b089e62f90aa2fa94b1af79cb0f2059d00dd132c..f75736a061af7778b86505f9a5696adc6d29a0c1
--- 1/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
--- 2/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml
@@@ -59,7 -59,6 +59,7 @@@ properties
             - enum:
                 - sifive,fu540-c000-plic
                 - starfive,jh7100-plic
+ +              - starfive,jh7110-plic
                 - canaan,k210-plic
             - const: sifive,plic-1.0.0
         - items:
@@@ -91,7 -90,7 +91,7 @@@
         riscv,cpu-intc node, which has a riscv node as parent.
   
     riscv,ndev:
-     $ref: "/schemas/types.yaml#/definitions/uint32"
+     $ref: /schemas/types.yaml#/definitions/uint32
       description:
         Specifies how many external interrupts are supported by this controller.
   
diff --combined Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml

index 8df8591360474bf536f8a0f1588c98a8c95cd77b,01b836aca065aeb511ed30ad18c403ef2b78b5db..a37447256f8dbd0ed57663fb1a02e9bd75e83e83
--- 1/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
--- 2/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
@@@ -86,7 -86,7 +86,7 @@@ properties
         is 100000 micro volts
   
     maxim,gpio-poc:
- -    $ref: '/schemas/types.yaml#/definitions/uint32-array'
+ +    $ref: /schemas/types.yaml#/definitions/uint32-array
       minItems: 2
       maxItems: 2
       description: |
@@@ -156,6 -156,7 +156,7 @@@
       patternProperties:
         "^i2c@[0-3]$":
           type: object
+         additionalProperties: false
           description: |
             Child node of the i2c bus multiplexer which represents a GMSL link.
             Each serializer device on the GMSL link remote end is represented with
@@@ -167,6 -168,12 +168,12 @@@
               description: The index of the GMSL channel.
               maxItems: 1
   
+           '#address-cells':
+             const: 1
+ 
+           '#size-cells':
+             const: 0
+ 
           patternProperties:
             "^camera@[a-f0-9]+$":
               type: object
diff --combined Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml

index 09533496b20c528c6491681b536df7458914e3a5,592cbcebc8eade0be032341d0083b64c82b9cbea..bce57b22f7b63bd73f08d8831d9bb04858ef03e0
--- 1/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
--- 2/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
@@@ -65,7 -65,7 +65,7 @@@ additionalProperties: fals
   
   examples:
     - |
-     i2c0 {
+     i2c {
           #address-cells = <1>;
           #size-cells = <0>;
   
@@@ -82,7 -82,7 +82,7 @@@
                   imx334: endpoint {
                       remote-endpoint = <&cam>;
                       data-lanes = <1 2 3 4>;
- -                    link-frequencies = /bits/ 64 <891000000>;
+ +                    link-frequencies = /bits/ 64 <891000000 445500000>;
                   };
               };
           };
diff --combined Documentation/devicetree/bindings/media/renesas,vin.yaml

index 7073d1936c34f6db943f9ef8649b97d803d7b67c,ffa7a6c4f2125212462ba1ab3e14b100066519e5..91e8f368fb520a3d6b1be2196dbba9cf49a8ebf1
--- 1/Documentation/devicetree/bindings/media/renesas,vin.yaml
--- 2/Documentation/devicetree/bindings/media/renesas,vin.yaml
+++ b/Documentation/devicetree/bindings/media/renesas,vin.yaml
@@@ -53,7 -53,6 +53,7 @@@ properties
                 - renesas,vin-r8a77990 # R-Car E3
                 - renesas,vin-r8a77995 # R-Car D3
                 - renesas,vin-r8a779a0 # R-Car V3U
+ +              - renesas,vin-r8a779g0 # R-Car V4H
   
     reg:
       maxItems: 1
@@@ -70,7 -69,7 +70,7 @@@
     resets:
       maxItems: 1
   
-   #The per-board settings for Gen2 and RZ/G1 platforms:
+   # The per-board settings for Gen2 and RZ/G1 platforms:
     port:
       $ref: /schemas/graph.yaml#/$defs/port-base
       unevaluatedProperties: false
@@@ -109,7 -108,7 +109,7 @@@
   
             data-active: true
   
-   #The per-board settings for Gen3 and RZ/G2 platforms:
+   # The per-board settings for Gen3 and RZ/G2 platforms:
     renesas,id:
       description: VIN channel number
       $ref: /schemas/types.yaml#/definitions/uint32
diff --combined Documentation/devicetree/bindings/media/ti,cal.yaml

index 478bdbe3d759597e0ba5a686b2974302546d5abc,26b3fedef35581e8b5ccab501e40343566fc60e7..f1a940a110d2605a6c65e339cdeee988dd176cca
--- 1/Documentation/devicetree/bindings/media/ti,cal.yaml
--- 2/Documentation/devicetree/bindings/media/ti,cal.yaml
+++ b/Documentation/devicetree/bindings/media/ti,cal.yaml
@@@ -47,7 -47,7 +47,7 @@@ properties
       maxItems: 1
   
     ti,camerrx-control:
- -    $ref: "/schemas/types.yaml#/definitions/phandle-array"
+ +    $ref: /schemas/types.yaml#/definitions/phandle-array
       items:
         - items:
             - description: phandle to device control module
@@@ -75,7 -75,7 +75,7 @@@
         port@0:
           $ref: /schemas/graph.yaml#/$defs/port-base
           unevaluatedProperties: false
-         description: CSI2 Port #0
+         description: 'CSI2 Port #0'
   
           properties:
             endpoint:
@@@ -93,7 -93,7 +93,7 @@@
         port@1:
           $ref: /schemas/graph.yaml#/$defs/port-base
           unevaluatedProperties: false
-         description: CSI2 Port #1
+         description: 'CSI2 Port #1'
   
           properties:
             endpoint:
diff --combined Documentation/devicetree/bindings/net/mdio-gpio.yaml

index dca1aec119e38a3ef6c5f0410a1cd2b084cbb5af,1376573418029097ed599161819f2d6dfa40f11c..eb4171a1940e479d595ab984c94aa586b838d7c7
--- 1/Documentation/devicetree/bindings/net/mdio-gpio.yaml
--- 2/Documentation/devicetree/bindings/net/mdio-gpio.yaml
+++ b/Documentation/devicetree/bindings/net/mdio-gpio.yaml
@@@ -12,7 -12,7 +12,7 @@@ maintainers
     - Russell King <linux@armlinux.org.uk>
   
   allOf:
- -  - $ref: "mdio.yaml#"
+ +  - $ref: mdio.yaml#
   
   properties:
     compatible:
@@@ -33,8 -33,8 +33,8 @@@
         - description: MDIO
         - description: MDO
   
- #Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases"
- #node.
+ # Note: Each gpio-mdio bus should have an alias correctly numbered in "aliases"
+ # node.
   additionalProperties:
     type: object
   
diff --combined Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml

index 4c4ced8cfa4b7975503e2707fc1a6eb1d957777b,1a2fec4857f5b138bd1da5817c0dba7defd3535e..4158673f723c9ec46b5e0843fb2d97f910ac6b4a
--- 1/Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml
--- 2/Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml
+++ b/Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml
@@@ -1,8 -1,8 +1,8 @@@
   # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
   %YAML 1.2
   ---
- -$id: "http://devicetree.org/schemas/net/vertexcom-mse102x.yaml#"
- -$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+ +$id: http://devicetree.org/schemas/net/vertexcom-mse102x.yaml#
+ +$schema: http://devicetree.org/meta-schemas/core.yaml#
   
   title: The Vertexcom MSE102x (SPI)
   
@@@ -55,7 -55,7 +55,7 @@@ additionalProperties: fals
   examples:
     - |
       #include <dt-bindings/interrupt-controller/irq.h>
-     spi0 {
+     spi {
           #address-cells = <1>;
           #size-cells = <0>;
   
diff --combined Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml

index e0ff5012b7634e2a6ed4521f417178ab9f9d890f,0c6032de593ab4497468b97bde0c6c8060b52d0e..5a6491a81fda09429e3c707bfa8b3a0c0f0a4522
--- 1/Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml
--- 2/Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml
@@@ -14,7 -14,7 +14,7 @@@ description
     regulator.yaml, can also be used.
   
   allOf:
- -  - $ref: "regulator.yaml#"
+ +  - $ref: regulator.yaml#
   
   properties:
     compatible:
@@@ -32,7 -32,7 +32,7 @@@ unevaluatedProperties: fals
   
   examples:
     - |
-     spi0 {
+     spi {
           #address-cells = <1>;
           #size-cells = <0>;
   
diff --combined Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml

index d2383e523875f7593482f4622a9fa4f0ca70fdcc,6b53dc87694e6a425ef07314f91096a76ceb0b94..3d469b8e9774841163f4e9366ded26d0120dd87e
--- 1/Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml
--- 2/Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml
@@@ -17,10 -17,10 +17,10 @@@ description: 
     Datasheet is available at
     https://www.nxp.com/docs/en/data-sheet/PCA9450DS.pdf
   
- #The valid names for PCA9450 regulator nodes are:
- #BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6,
- #LDO1, LDO2, LDO3, LDO4, LDO5
- #Note: Buck3 removed on PCA9450B and connect with Buck1 on PCA9450C.
+ # The valid names for PCA9450 regulator nodes are:
+ # BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6,
+ # LDO1, LDO2, LDO3, LDO4, LDO5
+ # Note: Buck3 removed on PCA9450B and connect with Buck1 on PCA9450C.
   
   properties:
     compatible:
@@@ -57,7 -57,7 +57,7 @@@
   
           properties:
             nxp,dvs-run-voltage:
- -            $ref: "/schemas/types.yaml#/definitions/uint32"
+ +            $ref: /schemas/types.yaml#/definitions/uint32
               minimum: 600000
               maximum: 2187500
               description:
@@@ -65,7 -65,7 +65,7 @@@
                 dvs(dynamic voltage scaling) property.
   
             nxp,dvs-standby-voltage:
- -            $ref: "/schemas/types.yaml#/definitions/uint32"
+ +            $ref: /schemas/types.yaml#/definitions/uint32
               minimum: 600000
               maximum: 2187500
               description:
diff --combined Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml

index 6b1c6a176dbeadbf6ce383e91b80c29fb58bb3c3,e094c40a7072ab22c6ac9d80e18cddceb18b79bf..894bdbca78a2d946650982e0527a5ce7c0f117b3
--- 1/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
--- 2/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
@@@ -38,6 -38,12 +38,6 @@@ properties
           description:
             Properties for single LDO regulator.
   
- -        properties:
- -          regulator-name:
- -            pattern: "^ldo[1-4]$"
- -            description:
- -              should be "ldo1", ..., "ldo4"
- -
           unevaluatedProperties: false
   
         "^buck[1-7]$":
@@@ -47,8 -53,13 +47,8 @@@
             Properties for single BUCK regulator.
   
           properties:
- -          regulator-name:
- -            pattern: "^buck[1-7]$"
- -            description:
- -              should be "buck1", ..., "buck7"
- -
             nxp,ilim-ma:
- -            $ref: "/schemas/types.yaml#/definitions/uint32"
+ +            $ref: /schemas/types.yaml#/definitions/uint32
               minimum: 2100
               maximum: 4500
               deprecated: true
@@@ -64,7 -75,7 +64,7 @@@
                 4500
   
             nxp,phase-shift:
- -            $ref: "/schemas/types.yaml#/definitions/uint32"
+ +            $ref: /schemas/types.yaml#/definitions/uint32
               default: 0
               enum: [ 0, 45, 90, 135, 180, 225, 270, 315 ]
               description:
@@@ -79,6 -90,12 +79,6 @@@
           description:
             Properties for single VSNVS regulator.
   
- -        properties:
- -          regulator-name:
- -            pattern: "^vsnvs$"
- -            description:
- -              should be "vsnvs"
- -
           unevaluatedProperties: false
   
       additionalProperties: false
@@@ -92,7 -109,7 +92,7 @@@ additionalProperties: fals
   
   examples:
     - |
-     i2c1 {
+     i2c {
           #address-cells = <1>;
           #size-cells = <0>;
   
diff --combined Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml

index 19b253c09e97dda43d6dc46f6a6b1d295d80bc8c,bbf38d5cd06dcb3ea35fd1e1de84c3bf07bdad86..d898800d6bcae3f41d5a184fe5d42dd8249d0b70
--- 1/Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
--- 2/Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
@@@ -52,7 -52,7 +52,7 @@@ patternProperties
           description:
             PMIC default "RUN" state voltage in uV. See below table for
             bucks which support this. 0 means disabled.
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 3300000
   
@@@ -60,7 -60,7 +60,7 @@@
           description:
             PMIC default "IDLE" state voltage in uV. See below table for
             bucks which support this. 0 means disabled.
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 3300000
   
@@@ -68,7 -68,7 +68,7 @@@
           description:
             PMIC default "SUSPEND" state voltage in uV. See below table for
             bucks which support this. 0 means disabled.
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 3300000
   
@@@ -76,26 -76,26 +76,26 @@@
           description:
             PMIC default "LPSR" state voltage in uV. See below table for
             bucks which support this. 0 means disabled.
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 3300000
   
           # Supported default DVS states:
           #     buck       |    run     |   idle    | suspend  | lpsr
-         #--------------------------------------------------------------
+         # --------------------------------------------------------------
           # 1, 2, 6, and 7 | supported  | supported | supported (*)
-         #--------------------------------------------------------------
+         # --------------------------------------------------------------
           # 3, 4, and 5    |                    supported (**)
-         #--------------------------------------------------------------
+         # --------------------------------------------------------------
           #
-         #(*)  LPSR and SUSPEND states use same voltage but both states have own
-         #     enable /
-         #     disable settings. Voltage 0 can be specified for a state to make
-         #     regulator disabled on that state.
+         # (*)  LPSR and SUSPEND states use same voltage but both states have own
+         #      enable /
+         #      disable settings. Voltage 0 can be specified for a state to make
+         #      regulator disabled on that state.
           #
-         #(**) All states use same voltage but have own enable / disable
-         #     settings. Voltage 0 can be specified for a state to make
-         #     regulator disabled on that state.
+         # (**) All states use same voltage but have own enable / disable
+         #      settings. Voltage 0 can be specified for a state to make
+         #      regulator disabled on that state.
   
       required:
         - regulator-name
diff --combined Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml

index 6e693fee3493583d02525583d57ae906cc726ee0,abf1fbdf385006f52f3f327b86c3896a1337efc7..29b350a4f88a0ba95f961561126ae3dbf8419d67
--- 1/Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
--- 2/Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
@@@ -23,9 -23,9 +23,9 @@@ description: 
     if they are disabled at startup the voltage monitoring for LDO5/LDO6 will
     cause PMIC to reset.
   
- #The valid names for BD71837 regulator nodes are:
- #BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, BUCK7, BUCK8
- #LDO1, LDO2, LDO3, LDO4, LDO5, LDO6, LDO7
+ # The valid names for BD71837 regulator nodes are:
+ # BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6, BUCK7, BUCK8
+ # LDO1, LDO2, LDO3, LDO4, LDO5, LDO6, LDO7
   
   patternProperties:
     "^LDO[1-7]$":
@@@ -55,7 -55,7 +55,7 @@@
             should be "buck1", ..., "buck8"
   
         rohm,dvs-run-voltage:
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 1300000
           description:
@@@ -63,7 -63,7 +63,7 @@@
             bucks which support this. 0 means disabled.
   
         rohm,dvs-idle-voltage:
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 1300000
           description:
@@@ -71,7 -71,7 +71,7 @@@
             bucks which support this. 0 means disabled.
   
         rohm,dvs-suspend-voltage:
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 1300000
           description:
diff --combined Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml

index 1d3dcfba58b016bdebde33174beae6849eb8f80d,34ce781954b6c5a58e0855ac03f7de29ecc09230..7ba4ccf723d8209b81aab79ce83400b710d3a108
--- 1/Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
--- 2/Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
@@@ -22,9 -22,9 +22,9 @@@ description: 
     not be disabled by driver at startup. If BUCK5 is disabled at startup the
     voltage monitoring for LDO5/LDO6 can cause PMIC to reset.
   
- #The valid names for BD71847 regulator nodes are:
- #BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6
- #LDO1, LDO2, LDO3, LDO4, LDO5, LDO6
+ # The valid names for BD71847 regulator nodes are:
+ # BUCK1, BUCK2, BUCK3, BUCK4, BUCK5, BUCK6
+ # LDO1, LDO2, LDO3, LDO4, LDO5, LDO6
   
   patternProperties:
     "^LDO[1-6]$":
@@@ -54,7 -54,7 +54,7 @@@
             should be "buck1", ..., "buck6"
   
         rohm,dvs-run-voltage:
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 1300000
           description:
@@@ -62,7 -62,7 +62,7 @@@
             bucks which support this. 0 means disabled.
   
         rohm,dvs-idle-voltage:
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 1300000
           description:
@@@ -70,7 -70,7 +70,7 @@@
             bucks which support this. 0 means disabled.
   
         rohm,dvs-suspend-voltage:
- -        $ref: "/schemas/types.yaml#/definitions/uint32"
+ +        $ref: /schemas/types.yaml#/definitions/uint32
           minimum: 0
           maximum: 1300000
           description:
diff --combined Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml

index 4502458b066907af5b7411cdf23fe7cd6fbe09ea,dfcd41429d258fd7945cf53fee01f18b3a23579e..e51acdcaafaf6fb444a23d1c0c8e56692d50e938
--- 1/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml
--- 2/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml
@@@ -1,8 -1,8 +1,8 @@@
   # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
   %YAML 1.2
   ---
- $id: "http://devicetree.org/schemas/soc/qcom/qcom,apr.yaml#"
- $schema: "http://devicetree.org/meta-schemas/core.yaml#"
+ $id: http://devicetree.org/schemas/soc/qcom/qcom,apr.yaml#
+ $schema: http://devicetree.org/meta-schemas/core.yaml#
   
   title: Qualcomm APR/GPR (Asynchronous/Generic Packet Router)
   
@@@ -62,14 -62,7 +62,14 @@@ properties
       maxItems: 1
   
     qcom,intents:
- -    $ref: /schemas/types.yaml#/definitions/uint32-array
+ +    $ref: /schemas/types.yaml#/definitions/uint32-matrix
+ +    minItems: 1
+ +    maxItems: 32
+ +    items:
+ +      items:
+ +        - description: size of each intent to preallocate
+ +        - description: amount of intents to preallocate
+ +          minimum: 1
       description:
         List of (size, amount) pairs describing what intents should be
         preallocated for this virtual channel. This can be used to tweak the
diff --combined Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml

index 94765fbc868e234a1926b1ae30ce1fbe73df6042,abb3bfde85a8c9722dd5c50ec2c394c49d83019d..ea86569a40d3cb2e72da2831f49f3e09828db103
--- 1/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml
--- 2/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml
@@@ -1,8 -1,8 +1,8 @@@
   # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
   %YAML 1.2
   ---
- $id: "http://devicetree.org/schemas/soc/qcom/qcom,smd-rpm.yaml#"
- $schema: "http://devicetree.org/meta-schemas/core.yaml#"
+ $id: http://devicetree.org/schemas/soc/qcom/qcom,smd-rpm.yaml#
+ $schema: http://devicetree.org/meta-schemas/core.yaml#
   
   title: Qualcomm Resource Power Manager (RPM) over SMD/GLINK
   
@@@ -33,7 -33,6 +33,7 @@@ properties
       enum:
         - qcom,rpm-apq8084
         - qcom,rpm-ipq6018
+ +      - qcom,rpm-ipq9574
         - qcom,rpm-msm8226
         - qcom,rpm-msm8909
         - qcom,rpm-msm8916
@@@ -41,7 -40,6 +41,7 @@@
         - qcom,rpm-msm8953
         - qcom,rpm-msm8974
         - qcom,rpm-msm8976
+ +      - qcom,rpm-msm8994
         - qcom,rpm-msm8996
         - qcom,rpm-msm8998
         - qcom,rpm-sdm660
@@@ -86,7 -84,6 +86,7 @@@ if
             - qcom,rpm-msm8974
             - qcom,rpm-msm8976
             - qcom,rpm-msm8953
+ +          - qcom,rpm-msm8994
   then:
     properties:
       qcom,glink-channels: false
diff --combined Documentation/devicetree/bindings/soc/renesas/renesas.yaml

index 60190d84d9b3c83c805d732c0bbe5bc4b93d1161,3a618b4c8ab737ee071fbbc5965b24c12db963df..53b95f348f8ee413d1f3387042c8a288aeeb4449
--- 1/Documentation/devicetree/bindings/soc/renesas/renesas.yaml
--- 2/Documentation/devicetree/bindings/soc/renesas/renesas.yaml
+++ b/Documentation/devicetree/bindings/soc/renesas/renesas.yaml
@@@ -111,7 -111,7 +111,7 @@@ properties
         - description: RZ/G1C (R8A77470)
           items:
             - enum:
-               - iwave,g23s #iWave Systems RZ/G1C Single Board Computer (iW-RainboW-G23S)
+               - iwave,g23s # iWave Systems RZ/G1C Single Board Computer (iW-RainboW-G23S)
             - const: renesas,r8a77470
   
         - description: RZ/G2M (R8A774A1)
@@@ -212,12 -212,12 +212,12 @@@
                 - renesas,silk # SILK (RTP0RC7794LCB00011S)
             - const: renesas,r8a7794
   
- -      - description: R-Car H3 (R8A77950)
+ +      # Note: R-Car H3 ES1.* (R8A77950) is not supported upstream anymore!
+ +
+ +      - description: R-Car H3 ES2.0 and later (R8A77951)
           items:
             - enum:
- -                # H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKBX0010SA00 (H3 ES1.1))
- -                # H3ULCB (R-Car Starter Kit Premier, RTP0RC77951SKBX010SA00 (H3 ES2.0))
- -              - renesas,h3ulcb
+ +              - renesas,h3ulcb # H3ULCB (R-Car Starter Kit Premier, RTP0RC77951SKBX010SA00 (H3 ES2.0))
                 - renesas,salvator-x # Salvator-X (RTP0RC7795SIPB0010S)
                 - renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
             - const: renesas,r8a7795
@@@ -431,13 -431,6 +431,13 @@@
                 - renesas,rzn1d400-db # RZN1D-DB (RZ/N1D Demo Board for the RZ/N1D 400 pins package)
             - const: renesas,r9a06g032
   
+ +      - description: RZ/N1{D,S} EB
+ +        items:
+ +          - enum:
+ +              - renesas,rzn1d400-eb # RZN1D-EB (Expansion Board when using a RZN1D-DB)
+ +          - const: renesas,rzn1d400-db
+ +          - const: renesas,r9a06g032
+ +
         - description: RZ/Five and RZ/G2UL (R9A07G043)
           items:
             - enum:
diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml

index 3e29fbd53b6d0e7149646c9b5f00bcfc2121ca1a,72c32f32a204c18d1e6d587e46c773875a99ac41..72c0f5dcef43e17f5cd96aae6325228055afc32f
--- 1/Documentation/devicetree/bindings/vendor-prefixes.yaml
--- 2/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -37,8 -37,6 +37,8 @@@ patternProperties
       description: Abracon Corporation
     "^abt,.*":
       description: ShenZhen Asia Better Technology Ltd.
+ +  "^acbel,.*":
+ +    description: Acbel Polytech Inc.
     "^acer,.*":
       description: Acer Inc.
     "^acme,.*":
@@@ -242,8 -240,6 +242,8 @@@
       description: CellWise Microelectronics Co., Ltd
     "^ceva,.*":
       description: Ceva, Inc.
+ +  "^chargebyte,.*":
+ +    description: chargebyte GmbH
     "^checkpoint,.*":
       description: Check Point Software Technologies Ltd.
     "^chefree,.*":
@@@ -520,8 -516,6 +520,8 @@@
       description: GlobalTop Technology, Inc.
     "^gmt,.*":
       description: Global Mixed-mode Technology, Inc.
+ +  "^goldelico,.*":
+ +    description: Golden Delicious Computers GmbH & Co. KG
     "^goodix,.*":
       description: Shenzhen Huiding Technology Co., Ltd.
     "^google,.*":
@@@ -727,8 -721,6 +727,8 @@@
       description: Lantiq Semiconductor
     "^lattice,.*":
       description: Lattice Semiconductor
+ +  "^lctech,.*":
+ +    description: Shenzen LC Technology Co., Ltd.
     "^leadtek,.*":
       description: Shenzhen Leadtek Technology Co., Ltd.
     "^leez,.*":
@@@ -941,6 -933,8 +941,8 @@@
       description: Nokia
     "^nordic,.*":
       description: Nordic Semiconductor
+   "^novatek,.*":
+     description: Novatek
     "^novtech,.*":
       description: NovTech, Inc.
     "^nutsboard,.*":
@@@ -985,8 -979,6 +987,8 @@@
       description: OpenCores.org
     "^openembed,.*":
       description: OpenEmbed
+ +  "^openpandora,.*":
+ +    description: OpenPandora GmbH
     "^openrisc,.*":
       description: OpenRISC.io
     "^option,.*":
@@@ -1253,8 -1245,6 +1255,8 @@@
       description: Solomon Systech Limited
     "^sony,.*":
       description: Sony Corporation
+ +  "^sourceparts,.*":
+ +    description: Source Parts Inc.
     "^spansion,.*":
       description: Spansion Inc.
     "^sparkfun,.*":
@@@ -1540,8 -1530,6 +1542,8 @@@
       description: Yes Optoelectronics Co.,Ltd.
     "^yic,.*":
       description: YIC System Co., Ltd.
+ +  "^yiming,.*":
+ +    description: Henan Yiming Technology Co., Ltd.
     "^ylm,.*":
       description: Shenzhen Yangliming Electronic Technology Co., Ltd.
     "^yna,.*":
diff --combined Documentation/devicetree/bindings/watchdog/apple,wdt.yaml

index 3d7e2a2bf1f1956d2d4568f041bb9a96a29b256c,20435a77e079dc52a3ad402f1b7688887c497b44..929681127df04155f3fa9a578934d444b716a5b7
--- 1/Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
--- 2/Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/apple,wdt.yaml
@@@ -7,7 -7,7 +7,7 @@@ $schema: http://devicetree.org/meta-sch
   title: Apple SoC Watchdog
   
   allOf:
-   - $ref: "watchdog.yaml#"
+   - $ref: watchdog.yaml#
   
   maintainers:
     - Sven Peter <sven@svenpeter.dev>
@@@ -17,7 -17,6 +17,7 @@@ properties
       items:
         - enum:
             - apple,t8103-wdt
+ +          - apple,t8112-wdt
             - apple,t6000-wdt
         - const: apple,wdt
   
diff --combined Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml

index e7a87ce94772cd2b84eb0473f33dbc6a1f0610b8,9387e4caa0fdc205c90ebc1ecbab13cd2552903a..39139586611b494d161172b4f53638ccdd9e7e02
--- 1/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
--- 2/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml
@@@ -7,7 -7,7 +7,7 @@@ $schema: http://devicetree.org/meta-sch
   title: Synopsys Designware Watchdog Timer
   
   allOf:
-   - $ref: "watchdog.yaml#"
+   - $ref: watchdog.yaml#
   
   maintainers:
     - Jamie Iles <jamie@jamieiles.com>
@@@ -29,7 -29,6 +29,7 @@@ properties
                 - rockchip,rk3368-wdt
                 - rockchip,rk3399-wdt
                 - rockchip,rk3568-wdt
+ +              - rockchip,rk3588-wdt
                 - rockchip,rv1108-wdt
             - const: snps,dw-wdt
   
diff --combined MAINTAINERS

index ebd26b3ca90e2a447c495c4f3187df8b5c2d7277,5d463f171c9001b06ad060a59afcb2ceba30b51e..5e11a9e9c4a089476ebb0601a8ac73e2422abcec
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -73,7 -73,7 +73,7 @@@ Tips for patch submitter
         and ideally, should come with a patch proposal. Please do not send
         automated reports to this list either. Such bugs will be handled
         better and faster in the usual public places. See
- -      Documentation/admin-guide/security-bugs.rst for details.
+ +      Documentation/process/security-bugs.rst for details.
   
   8.    Happy hacking.
   
@@@ -224,13 -224,13 +224,13 @@@ S:      Orphan / Obsolet
   F:    drivers/net/ethernet/8390/
   
   9P FILE SYSTEM
- -M:    Eric Van Hensbergen <ericvh@gmail.com>
+ +M:    Eric Van Hensbergen <ericvh@kernel.org>
   M:    Latchesar Ionkov <lucho@ionkov.net>
   M:    Dominique Martinet <asmadeus@codewreck.org>
   R:    Christian Schoenebeck <linux_oss@crudebyte.com>
- -L:    v9fs-developer@lists.sourceforge.net
+ +L:    v9fs@lists.linux.dev
   S:    Maintained
- -W:    http://swik.net/v9fs
+ +W:    http://github.com/v9fs
   Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
   T:    git git://github.com/martinetd/linux.git
@@@ -1041,15 -1041,6 +1041,15 @@@ F:    drivers/gpu/drm/amd/include/vi_struc
   F:    include/uapi/linux/kfd_ioctl.h
   F:    include/uapi/linux/kfd_sysfs.h
   
+ +AMD PDS CORE DRIVER
+ +M:    Shannon Nelson <shannon.nelson@amd.com>
+ +M:    Brett Creeley <brett.creeley@amd.com>
+ +L:    netdev@vger.kernel.org
+ +S:    Supported
+ +F:    Documentation/networking/device_drivers/ethernet/amd/pds_core.rst
+ +F:    drivers/net/ethernet/amd/pds_core/
+ +F:    include/linux/pds/
+ +
   AMD SPI DRIVER
   M:    Sanjay R Mehta <sanju.mehta@amd.com>
   S:    Maintained
@@@ -1080,7 -1071,7 +1080,7 @@@ M:      Naveen Krishna Chatradhi <naveenkris
   R:    Carlos Bilbao <carlos.bilbao@amd.com>
   L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
- -F:    Documentation/x86/amd_hsmp.rst
+ +F:    Documentation/arch/x86/amd_hsmp.rst
   F:    arch/x86/include/asm/amd_hsmp.h
   F:    arch/x86/include/uapi/asm/amd_hsmp.h
   F:    drivers/platform/x86/amd/hsmp.c
@@@ -1236,6 -1227,12 +1236,6 @@@ F:     Documentation/devicetree/bindings/ii
   F:    drivers/iio/addac/ad74413r.c
   F:    include/dt-bindings/iio/addac/adi,ad74413r.h
   
- -ANALOG DEVICES INC AD9389B DRIVER
- -M:    Hans Verkuil <hverkuil-cisco@xs4all.nl>
- -L:    linux-media@vger.kernel.org
- -S:    Maintained
- -F:    drivers/media/i2c/ad9389b*
- -
   ANALOG DEVICES INC ADA4250 DRIVER
   M:    Antoniu Miclaus <antoniu.miclaus@analog.com>
   L:    linux-iio@vger.kernel.org
@@@ -2278,7 -2275,7 +2278,7 @@@ F:      arch/arm/boot/dts/intel-ixp
   F:    arch/arm/mach-ixp4xx/
   F:    drivers/bus/intel-ixp4xx-eb.c
   F:    drivers/clocksource/timer-ixp4xx.c
- -F:    drivers/crypto/ixp4xx_crypto.c
+ +F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
   F:    drivers/gpio/gpio-ixp4xx.c
   F:    drivers/irqchip/irq-ixp4xx.c
   
@@@ -2607,12 -2604,6 +2607,12 @@@ F:    include/dt-bindings/*/qcom
   F:    include/linux/*/qcom*
   F:    include/linux/soc/qcom/
   
+ +ARM/QUALCOMM CHROMEBOOK SUPPORT
+ +R:    cros-qcom-dts-watchers@chromium.org
+ +F:    arch/arm64/boot/dts/qcom/sc7180*
+ +F:    arch/arm64/boot/dts/qcom/sc7280*
+ +F:    arch/arm64/boot/dts/qcom/sdm845-cheza*
+ +
   ARM/RDA MICRO ARCHITECTURE
   M:    Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
   L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2663,7 -2654,6 +2663,7 @@@ F:      arch/arm64/boot/dts/renesas
   F:    arch/riscv/boot/dts/renesas/
   F:    drivers/soc/renesas/
   F:    include/linux/soc/renesas/
+ +K:    \brenesas,
   
   ARM/RISCPC ARCHITECTURE
   M:    Russell King <linux@armlinux.org.uk>
@@@ -4441,13 -4431,6 +4441,13 @@@ S:    Maintaine
   F:    drivers/scsi/BusLogic.*
   F:    drivers/scsi/FlashPoint.*
   
+ +BXCAN CAN NETWORK DRIVER
+ +M:    Dario Binacchi <dario.binacchi@amarulasolutions.com>
+ +L:    linux-can@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/can/st,stm32-bxcan.yaml
+ +F:    drivers/net/can/bxcan.c
+ +
   C-MEDIA CMI8788 DRIVER
   M:    Clemens Ladisch <clemens@ladisch.de>
   L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -4478,14 -4461,14 +4478,14 @@@ F:   Documentation/devicetree/bindings/ne
   F:    drivers/net/ieee802154/ca8210.c
   
   CANAAN/KENDRYTE K210 SOC FPIOA DRIVER
- -M:    Damien Le Moal <damien.lemoal@wdc.com>
+ +M:    Damien Le Moal <dlemoal@kernel.org>
   L:    linux-riscv@lists.infradead.org
   L:    linux-gpio@vger.kernel.org (pinctrl driver)
   F:    Documentation/devicetree/bindings/pinctrl/canaan,k210-fpioa.yaml
   F:    drivers/pinctrl/pinctrl-k210.c
   
   CANAAN/KENDRYTE K210 SOC RESET CONTROLLER DRIVER
- -M:    Damien Le Moal <damien.lemoal@wdc.com>
+ +M:    Damien Le Moal <dlemoal@kernel.org>
   L:    linux-kernel@vger.kernel.org
   L:    linux-riscv@lists.infradead.org
   S:    Maintained
@@@ -4493,7 -4476,7 +4493,7 @@@ F:      Documentation/devicetree/bindings/re
   F:    drivers/reset/reset-k210.c
   
   CANAAN/KENDRYTE K210 SOC SYSTEM CONTROLLER DRIVER
- -M:    Damien Le Moal <damien.lemoal@wdc.com>
+ +M:    Damien Le Moal <dlemoal@kernel.org>
   L:    linux-riscv@lists.infradead.org
   S:    Maintained
   F:      Documentation/devicetree/bindings/mfd/canaan,k210-sysctl.yaml
@@@ -5957,6 -5940,11 +5957,6 @@@ F:     drivers/devfreq/event
   F:    include/dt-bindings/pmu/exynos_ppmu.h
   F:    include/linux/devfreq-event.h
   
- -DEVICE NUMBER REGISTRY
- -M:    Torben Mathiasen <device@lanana.org>
- -S:    Maintained
- -W:    http://lanana.org/docs/device-list/index.html
- -
   DEVICE RESOURCE MANAGEMENT HELPERS
   M:    Hans de Goede <hdegoede@redhat.com>
   R:    Matti Vaittinen <mazziesaccount@gmail.com>
@@@ -5983,7 -5971,7 +5983,7 @@@ F:      include/linux/dm-*.
   F:    include/uapi/linux/dm-*.h
   
   DEVLINK
- -M:    Jiri Pirko <jiri@nvidia.com>
+ +M:    Jiri Pirko <jiri@resnulli.us>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    Documentation/networking/devlink
@@@ -6219,7 -6207,6 +6219,7 @@@ DOCUMENTATION REPORTING ISSUE
   M:    Thorsten Leemhuis <linux@leemhuis.info>
   L:    linux-doc@vger.kernel.org
   S:    Maintained
+ +F:    Documentation/admin-guide/quickly-build-trimmed-linux.rst
   F:    Documentation/admin-guide/reporting-issues.rst
   
   DOCUMENTATION SCRIPTS
@@@ -6531,7 -6518,6 +6531,7 @@@ L:      linux-arm-msm@vger.kernel.or
   L:    dri-devel@lists.freedesktop.org
   L:    freedreno@lists.freedesktop.org
   S:    Maintained
+ +B:    https://gitlab.freedesktop.org/drm/msm/-/issues
   T:    git https://gitlab.freedesktop.org/drm/msm.git
   F:    Documentation/devicetree/bindings/display/msm/
   F:    drivers/gpu/drm/msm/
@@@ -6551,13 -6537,6 +6551,13 @@@ T:    git git://anongit.freedesktop.org/dr
   F:    Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
   F:    drivers/gpu/drm/panel/panel-novatek-nt35560.c
   
+ +DRM DRIVER FOR NOVATEK NT36523 PANELS
+ +M:    Jianhua Lu <lujianhua000@gmail.com>
+ +S:    Maintained
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +F:    Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml
+ +F:    drivers/gpu/drm/panel/panel-novatek-nt36523.c
+ +
   DRM DRIVER FOR NOVATEK NT36672A PANELS
   M:    Sumit Semwal <sumit.semwal@linaro.org>
   S:    Maintained
@@@ -6638,16 -6617,6 +6638,16 @@@ T:    git git://anongit.freedesktop.org/dr
   F:    Documentation/devicetree/bindings/display/panel/samsung,lms397kf04.yaml
   F:    drivers/gpu/drm/panel/panel-samsung-db7430.c
   
+ +DRM DRIVER FOR SAMSUNG MIPI DSIM BRIDGE
+ +M:    Inki Dae <inki.dae@samsung.com>
+ +M:    Jagan Teki <jagan@amarulasolutions.com>
+ +M:    Marek Szyprowski <m.szyprowski@samsung.com>
+ +S:    Maintained
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +F:    Documentation/devicetree/bindings/display/bridge/samsung,mipi-dsim.yaml
+ +F:    drivers/gpu/drm/bridge/samsung-dsim.c
+ +F:    include/drm/bridge/samsung-dsim.h
+ +
   DRM DRIVER FOR SAMSUNG S6D27A1 PANELS
   M:    Markuss Broks <markuss.broks@gmail.com>
   S:    Maintained
@@@ -6855,7 -6824,6 +6855,7 @@@ S:      Maintaine
   T:    git git://anongit.freedesktop.org/drm/drm-misc
   F:    Documentation/devicetree/bindings/display/bridge/
   F:    drivers/gpu/drm/bridge/
+ +F:    include/drm/drm_bridge.h
   
   DRM DRIVERS FOR EXYNOS
   M:    Inki Dae <inki.dae@samsung.com>
@@@ -6948,7 -6916,6 +6948,7 @@@ F:      drivers/phy/mediatek/phy-mtk-mipi
   
   DRM DRIVERS FOR NVIDIA TEGRA
   M:    Thierry Reding <thierry.reding@gmail.com>
+ +M:    Mikko Perttunen <mperttunen@nvidia.com>
   L:    dri-devel@lists.freedesktop.org
   L:    linux-tegra@vger.kernel.org
   S:    Supported
@@@ -7077,7 -7044,7 +7077,7 @@@ F:      Documentation/devicetree/bindings/di
   F:    drivers/gpu/drm/xlnx/
   
   DRM PANEL DRIVERS
- -M:    Thierry Reding <thierry.reding@gmail.com>
+ +M:    Neil Armstrong <neil.armstrong@linaro.org>
   R:    Sam Ravnborg <sam@ravnborg.org>
   L:    dri-devel@lists.freedesktop.org
   S:    Maintained
@@@ -7761,7 -7728,6 +7761,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
   F:    Documentation/filesystems/ext4/
   F:    fs/ext4/
   F:    include/trace/events/ext4.h
+ +F:    include/uapi/linux/ext4.h
   
   Extended Verification Module (EVM)
   M:    Mimi Zohar <zohar@linux.ibm.com>
@@@ -8134,7 -8100,7 +8134,7 @@@ M:      Pankaj Gupta <pankaj.gupta@nxp.com
   M:    Gaurav Jain <gaurav.jain@nxp.com>
   L:    linux-crypto@vger.kernel.org
   S:    Maintained
- F:    Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+ F:    Documentation/devicetree/bindings/crypto/fsl,sec-v4.0*
   F:    drivers/crypto/caam/
   
   FREESCALE COLDFIRE M5441X MMC DRIVER
@@@ -8250,7 -8216,6 +8250,7 @@@ F:      drivers/net/ethernet/freescale/dpa
   
   FREESCALE QORIQ DPAA FMAN DRIVER
   M:    Madalin Bucur <madalin.bucur@nxp.com>
+ +R:    Sean Anderson <sean.anderson@seco.com>
   L:    netdev@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/net/fsl-fman.txt
@@@ -8452,6 -8417,14 +8452,6 @@@ L:     platform-driver-x86@vger.kernel.or
   S:    Maintained
   F:    drivers/platform/x86/fujitsu-laptop.c
   
- -FUJITSU M-5MO LS CAMERA ISP DRIVER
- -M:    Kyungmin Park <kyungmin.park@samsung.com>
- -M:    Heungjun Kim <riverful.kim@samsung.com>
- -L:    linux-media@vger.kernel.org
- -S:    Maintained
- -F:    drivers/media/i2c/m5mols/
- -F:    include/media/i2c/m5mols.h
- -
   FUJITSU TABLET EXTRAS
   M:    Robert Gerlach <khnz@gmx.de>
   L:    platform-driver-x86@vger.kernel.org
@@@ -8716,7 -8689,7 +8716,7 @@@ F:      drivers/input/touchscreen/goodix
   
   GOOGLE ETHERNET DRIVERS
   M:    Jeroen de Borst <jeroendb@google.com>
- -M:    Catherine Sullivan <csully@google.com>
+ +M:    Praveen Kaligineedi <pkaligineedi@google.com>
   R:    Shailend Chand <shailend@google.com>
   L:    netdev@vger.kernel.org
   S:    Supported
@@@ -8779,6 -8752,7 +8779,6 @@@ F:      Documentation/admin-guide/gpio
   F:    Documentation/devicetree/bindings/gpio/
   F:    Documentation/driver-api/gpio/
   F:    drivers/gpio/
- -F:    include/asm-generic/gpio.h
   F:    include/dt-bindings/gpio/
   F:    include/linux/gpio.h
   F:    include/linux/gpio/
@@@ -8965,17 -8939,6 +8965,17 @@@ Q:    http://patchwork.linuxtv.org/project
   T:    git git://linuxtv.org/anttip/media_tree.git
   F:    drivers/media/usb/hackrf/
   
+ +HANDSHAKE UPCALL FOR TRANSPORT LAYER SECURITY
+ +M:    Chuck Lever <chuck.lever@oracle.com>
+ +L:    kernel-tls-handshake@lists.linux.dev
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/netlink/specs/handshake.yaml
+ +F:    Documentation/networking/tls-handshake.rst
+ +F:    include/net/handshake.h
+ +F:    include/trace/events/handshake.h
+ +F:    net/handshake/
+ +
   HANTRO VPU CODEC DRIVER
   M:    Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
   M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -9765,7 -9728,7 +9765,7 @@@ F:      include/linux/i3c
   IA64 (Itanium) PLATFORM
   L:    linux-ia64@vger.kernel.org
   S:    Orphan
- -F:    Documentation/ia64/
+ +F:    Documentation/arch/ia64/
   F:    arch/ia64/
   
   IBM Operation Panel Input Driver
@@@ -9908,10 -9871,10 +9908,10 @@@ M:   Christian Brauner <brauner@kernel.or
   M:    Seth Forshee <sforshee@kernel.org>
   L:    linux-fsdevel@vger.kernel.org
   S:    Maintained
- -T:    git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git
+ +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git
   F:    Documentation/filesystems/idmappings.rst
- -F:    tools/testing/selftests/mount_setattr/
   F:    include/linux/mnt_idmapping.*
+ +F:    tools/testing/selftests/mount_setattr/
   
   IDT VersaClock 5 CLOCK DRIVER
   M:    Luca Ceresoli <luca@lucaceresoli.net>
@@@ -10319,14 -10282,12 +10319,14 @@@ M:        Andy Shevchenko <andy@kernel.org
   L:    linux-gpio@vger.kernel.org
   S:    Supported
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
+ +F:    drivers/gpio/gpio-elkhartlake.c
   F:    drivers/gpio/gpio-ich.c
   F:    drivers/gpio/gpio-merrifield.c
   F:    drivers/gpio/gpio-ml-ioh.c
   F:    drivers/gpio/gpio-pch.c
   F:    drivers/gpio/gpio-sch.c
   F:    drivers/gpio/gpio-sodaville.c
+ +F:    drivers/gpio/gpio-tangier.c
   
   INTEL GVT-g DRIVERS (Intel GPU Virtualization)
   M:    Zhenyu Wang <zhenyuw@linux.intel.com>
@@@ -10419,7 -10380,7 +10419,7 @@@ INTEL IXP4XX CRYPTO SUPPOR
   M:    Corentin Labbe <clabbe@baylibre.com>
   L:    linux-crypto@vger.kernel.org
   S:    Maintained
- -F:    drivers/crypto/ixp4xx_crypto.c
+ +F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
   
   INTEL ISHTP ECLITE DRIVER
   M:    Sumesh K Naduvalath <sumesh.k.naduvalath@intel.com>
@@@ -10454,11 -10415,11 +10454,11 @@@ INTEL KEEM BAY OCS AES/SM4 CRYPTO DRIVE
   M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
   S:    Maintained
   F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-aes.yaml
- -F:    drivers/crypto/keembay/Kconfig
- -F:    drivers/crypto/keembay/Makefile
- -F:    drivers/crypto/keembay/keembay-ocs-aes-core.c
- -F:    drivers/crypto/keembay/ocs-aes.c
- -F:    drivers/crypto/keembay/ocs-aes.h
+ +F:    drivers/crypto/intel/keembay/Kconfig
+ +F:    drivers/crypto/intel/keembay/Makefile
+ +F:    drivers/crypto/intel/keembay/keembay-ocs-aes-core.c
+ +F:    drivers/crypto/intel/keembay/ocs-aes.c
+ +F:    drivers/crypto/intel/keembay/ocs-aes.h
   
   INTEL KEEM BAY OCS ECC CRYPTO DRIVER
   M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
@@@ -10466,20 -10427,20 +10466,20 @@@ M:        Prabhjot Khurana <prabhjot.khurana@i
   M:    Mark Gross <mgross@linux.intel.com>
   S:    Maintained
   F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
- -F:    drivers/crypto/keembay/Kconfig
- -F:    drivers/crypto/keembay/Makefile
- -F:    drivers/crypto/keembay/keembay-ocs-ecc.c
+ +F:    drivers/crypto/intel/keembay/Kconfig
+ +F:    drivers/crypto/intel/keembay/Makefile
+ +F:    drivers/crypto/intel/keembay/keembay-ocs-ecc.c
   
   INTEL KEEM BAY OCS HCU CRYPTO DRIVER
   M:    Daniele Alessandrelli <daniele.alessandrelli@intel.com>
   M:    Declan Murphy <declan.murphy@intel.com>
   S:    Maintained
   F:    Documentation/devicetree/bindings/crypto/intel,keembay-ocs-hcu.yaml
- -F:    drivers/crypto/keembay/Kconfig
- -F:    drivers/crypto/keembay/Makefile
- -F:    drivers/crypto/keembay/keembay-ocs-hcu-core.c
- -F:    drivers/crypto/keembay/ocs-hcu.c
- -F:    drivers/crypto/keembay/ocs-hcu.h
+ +F:    drivers/crypto/intel/keembay/Kconfig
+ +F:    drivers/crypto/intel/keembay/Makefile
+ +F:    drivers/crypto/intel/keembay/keembay-ocs-hcu-core.c
+ +F:    drivers/crypto/intel/keembay/ocs-hcu.c
+ +F:    drivers/crypto/intel/keembay/ocs-hcu.h
   
   INTEL THUNDER BAY EMMC PHY DRIVER
   M:    Nandhini Srikandan <nandhini.srikandan@intel.com>
@@@ -10686,7 -10647,7 +10686,7 @@@ L:   tboot-devel@lists.sourceforge.ne
   S:    Supported
   W:    http://tboot.sourceforge.net
   T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
- -F:    Documentation/x86/intel_txt.rst
+ +F:    Documentation/arch/x86/intel_txt.rst
   F:    arch/x86/kernel/tboot.c
   F:    include/linux/tboot.h
   
@@@ -10697,7 -10658,7 +10697,7 @@@ L:   linux-sgx@vger.kernel.or
   S:    Supported
   Q:    https://patchwork.kernel.org/project/intel-sgx/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/sgx
- -F:    Documentation/x86/sgx.rst
+ +F:    Documentation/arch/x86/sgx.rst
   F:    arch/x86/entry/vdso/vsgx.S
   F:    arch/x86/include/asm/sgx.h
   F:    arch/x86/include/uapi/asm/sgx.h
@@@ -11796,7 -11757,7 +11796,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
   F:    drivers/ata/sata_promise.*
   
   LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
- -M:    Damien Le Moal <damien.lemoal@opensource.wdc.com>
+ +M:    Damien Le Moal <dlemoal@kernel.org>
   L:    linux-ide@vger.kernel.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
@@@ -11932,6 -11893,7 +11932,7 @@@ M:   Scott Wood <oss@buserror.net
   L:    linuxppc-dev@lists.ozlabs.org
   S:    Odd fixes
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
+ F:    Documentation/devicetree/bindings/cache/freescale-l2cache.txt
   F:    Documentation/devicetree/bindings/powerpc/fsl/
   F:    arch/powerpc/platforms/83xx/
   F:    arch/powerpc/platforms/85xx/
@@@ -12155,13 -12117,6 +12156,13 @@@ S: Maintaine
   F:    Documentation/devicetree/bindings/pinctrl/loongson,ls2k-pinctrl.yaml
   F:    drivers/pinctrl/pinctrl-loongson2.c
   
+ +LOONGSON GPIO DRIVER
+ +M:    Yinbo Zhu <zhuyinbo@loongson.cn>
+ +L:    linux-gpio@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/gpio/loongson,ls-gpio.yaml
+ +F:    drivers/gpio/gpio-loongson-64bit.c
+ +
   LOONGSON-2 SOC SERIES CLOCK DRIVER
   M:    Yinbo Zhu <zhuyinbo@loongson.cn>
   L:    linux-clk@vger.kernel.org
@@@ -12321,7 -12276,7 +12322,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
   F:    Documentation/networking/mac80211-injection.rst
   F:    Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst
- -F:    drivers/net/wireless/mac80211_hwsim.[ch]
+ +F:    drivers/net/wireless/virtual/mac80211_hwsim.[ch]
   F:    include/net/mac80211.h
   F:    net/mac80211/
   
@@@ -13088,14 -13043,6 +13089,14 @@@ L: netdev@vger.kernel.or
   S:    Maintained
   F:    drivers/net/ethernet/mediatek/
   
+ +MEDIATEK ETHERNET PCS DRIVER
+ +M:    Alexander Couzens <lynxis@fe80.eu>
+ +M:    Daniel Golle <daniel@makrotopia.org>
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/net/pcs/pcs-mtk-lynxi.c
+ +F:    include/linux/pcs/pcs-mtk-lynxi.h
+ +
   MEDIATEK I2C CONTROLLER DRIVER
   M:    Qii Wang <qii.wang@mediatek.com>
   L:    linux-i2c@vger.kernel.org
@@@ -13220,11 -13167,8 +13221,11 @@@ MEDIATEK SWITCH DRIVE
   M:    Sean Wang <sean.wang@mediatek.com>
   M:    Landen Chao <Landen.Chao@mediatek.com>
   M:    DENG Qingfang <dqfext@gmail.com>
+ +M:    Daniel Golle <daniel@makrotopia.org>
   L:    netdev@vger.kernel.org
   S:    Maintained
+ +F:    drivers/net/dsa/mt7530-mdio.c
+ +F:    drivers/net/dsa/mt7530-mmio.c
   F:    drivers/net/dsa/mt7530.*
   F:    net/dsa/tag_mtk.c
   
@@@ -14195,13 -14139,6 +14196,13 @@@ S: Odd Fixe
   F:    Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
   F:    drivers/net/ieee802154/mrf24j40.c
   
+ +MSI EC DRIVER
+ +M:    Nikita Kravets <teackot@gmail.com>
+ +L:    platform-driver-x86@vger.kernel.org
+ +S:    Maintained
+ +W:    https://github.com/BeardOverflow/msi-ec
+ +F:    drivers/platform/x86/msi-ec.*
+ +
   MSI LAPTOP SUPPORT
   M:    "Lee, Chun-Yi" <jlee@suse.com>
   L:    platform-driver-x86@vger.kernel.org
@@@ -14246,6 -14183,14 +14247,6 @@@ L:  linux-mtd@lists.infradead.or
   S:    Maintained
   F:    drivers/mtd/devices/docg3*
   
- -MT9M032 APTINA SENSOR DRIVER
- -M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- -L:    linux-media@vger.kernel.org
- -S:    Maintained
- -T:    git git://linuxtv.org/media_tree.git
- -F:    drivers/media/i2c/mt9m032.c
- -F:    include/media/i2c/mt9m032.h
- -
   MT9P031 APTINA CAMERA SENSOR
   M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
   L:    linux-media@vger.kernel.org
@@@ -14255,6 -14200,14 +14256,6 @@@ F:  Documentation/devicetree/bindings/me
   F:    drivers/media/i2c/mt9p031.c
   F:    include/media/i2c/mt9p031.h
   
- -MT9T001 APTINA CAMERA SENSOR
- -M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- -L:    linux-media@vger.kernel.org
- -S:    Maintained
- -T:    git git://linuxtv.org/media_tree.git
- -F:    drivers/media/i2c/mt9t001.c
- -F:    include/media/i2c/mt9t001.h
- -
   MT9T112 APTINA CAMERA SENSOR
   M:    Jacopo Mondi <jacopo@jmondi.org>
   L:    linux-media@vger.kernel.org
@@@ -14641,14 -14594,11 +14642,14 @@@ F:        net/netlabel
   
   NETWORKING [MPTCP]
   M:    Matthieu Baerts <matthieu.baerts@tessares.net>
+ +M:    Mat Martineau <martineau@kernel.org>
   L:    netdev@vger.kernel.org
   L:    mptcp@lists.linux.dev
   S:    Maintained
   W:    https://github.com/multipath-tcp/mptcp_net-next/wiki
   B:    https://github.com/multipath-tcp/mptcp_net-next/issues
+ +T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
+ +T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
   F:    Documentation/networking/mptcp-sysctl.rst
   F:    include/net/mptcp.h
   F:    include/trace/events/mptcp.h
@@@ -14707,10 -14657,13 +14708,10 @@@ F:        net/ipv4/nexthop.
   
   NFC SUBSYSTEM
   M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
- -L:    linux-nfc@lists.01.org (subscribers-only)
   L:    netdev@vger.kernel.org
   S:    Maintained
- -B:    mailto:linux-nfc@lists.01.org
   F:    Documentation/devicetree/bindings/net/nfc/
   F:    drivers/nfc/
- -F:    include/linux/platform_data/nfcmrvl.h
   F:    include/net/nfc/
   F:    include/uapi/linux/nfc.h
   F:    net/nfc/
@@@ -14718,6 -14671,7 +14719,6 @@@
   NFC VIRTUAL NCI DEVICE DRIVER
   M:    Bongsu Jeon <bongsu.jeon@samsung.com>
   L:    netdev@vger.kernel.org
- -L:    linux-nfc@lists.01.org (subscribers-only)
   S:    Supported
   F:    drivers/nfc/virtual_ncidev.c
   F:    tools/testing/selftests/nci/
@@@ -14793,7 -14747,7 +14794,7 @@@ F:   include/uapi/linux/nitro_enclaves.
   F:    samples/nitro_enclaves/
   
   NOHZ, DYNTICKS SUPPORT
- -M:    Frederic Weisbecker <fweisbec@gmail.com>
+ +M:    Frederic Weisbecker <frederic@kernel.org>
   M:    Thomas Gleixner <tglx@linutronix.de>
   M:    Ingo Molnar <mingo@kernel.org>
   L:    linux-kernel@vger.kernel.org
@@@ -14919,12 -14873,12 +14920,12 @@@ M:        Sagi Grimberg <sagi@grimberg.me
   L:    linux-nvme@lists.infradead.org
   S:    Supported
   W:    http://git.infradead.org/nvme.git
- -T:    git://git.infradead.org/nvme.git
+ +T:    git git://git.infradead.org/nvme.git
   F:    Documentation/nvme/
- -F:    drivers/nvme/host/
   F:    drivers/nvme/common/
- -F:    include/linux/nvme.h
+ +F:    drivers/nvme/host/
   F:    include/linux/nvme-*.h
+ +F:    include/linux/nvme.h
   F:    include/uapi/linux/nvme_ioctl.h
   
   NVM EXPRESS FABRICS AUTHENTICATION
@@@ -14959,7 -14913,7 +14960,7 @@@ M:   Chaitanya Kulkarni <kch@nvidia.com
   L:    linux-nvme@lists.infradead.org
   S:    Supported
   W:    http://git.infradead.org/nvme.git
- -T:    git://git.infradead.org/nvme.git
+ +T:    git git://git.infradead.org/nvme.git
   F:    drivers/nvme/target/
   
   NVMEM FRAMEWORK
@@@ -15008,13 -14962,6 +15009,13 @@@ F: Documentation/devicetree/bindings/cl
   F:    drivers/clk/imx/
   F:    include/dt-bindings/clock/imx*
   
+ +NXP i.MX 8M ISI DRIVER
+ +M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ +L:    linux-media@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
+ +F:    drivers/media/platform/nxp/imx8-isi/
+ +
   NXP i.MX 8MQ DCSS DRIVER
   M:    Laurentiu Palcu <laurentiu.palcu@oss.nxp.com>
   R:    Lucas Stach <l.stach@pengutronix.de>
@@@ -15096,6 -15043,7 +15097,6 @@@ F:   Documentation/devicetree/bindings/so
   F:    sound/soc/codecs/tfa989x.c
   
   NXP-NCI NFC DRIVER
- -L:    linux-nfc@lists.01.org (subscribers-only)
   S:    Orphan
   F:    Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml
   F:    drivers/nfc/nxp-nci
@@@ -15132,7 -15080,7 +15133,7 @@@ F:   Documentation/hwmon/nzxt-smart2.rs
   F:    drivers/hwmon/nzxt-smart2.c
   
   OBJAGG
- -M:    Jiri Pirko <jiri@nvidia.com>
+ +M:    Jiri Pirko <jiri@resnulli.us>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    include/linux/objagg.h
@@@ -15442,7 -15390,6 +15443,7 @@@ M:   Shunqian Zheng <zhengsq@rock-chips.c
   L:    linux-media@vger.kernel.org
   S:    Maintained
   T:    git git://linuxtv.org/media_tree.git
+ +F:    Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml
   F:    drivers/media/i2c/ov2685.c
   
   OMNIVISION OV2740 SENSOR DRIVER
@@@ -15534,7 -15481,7 +15535,7 @@@ F:   Documentation/devicetree/bindings/me
   F:    drivers/media/i2c/ov7740.c
   
   OMNIVISION OV8856 SENSOR DRIVER
- -M:    Dongchun Zhu <dongchun.zhu@mediatek.com>
+ +M:    Sakari Ailus <sakari.ailus@linux.intel.com>
   L:    linux-media@vger.kernel.org
   S:    Maintained
   T:    git git://linuxtv.org/media_tree.git
@@@ -15677,13 -15624,6 +15678,13 @@@ L: netdev@vger.kernel.or
   S:    Maintained
   F:    drivers/ptp/ptp_ocp.c
   
+ +INTEL PTP DFL ToD DRIVER
+ +M:    Tianfei Zhang <tianfei.zhang@intel.com>
+ +L:    linux-fpga@vger.kernel.org
+ +L:    netdev@vger.kernel.org
+ +S:    Maintained
+ +F:    drivers/ptp/ptp_dfl_tod.c
+ +
   OPENCORES I2C BUS DRIVER
   M:    Peter Korsgaard <peter@korsgaard.com>
   M:    Andrew Lunn <andrew@lunn.ch>
@@@ -15703,7 -15643,7 +15704,7 @@@ S:   Maintaine
   W:    http://openrisc.io
   T:    git https://github.com/openrisc/linux.git
   F:    Documentation/devicetree/bindings/openrisc/
- -F:    Documentation/openrisc/
+ +F:    Documentation/arch/openrisc/
   F:    arch/openrisc/
   F:    drivers/irqchip/irq-ompic.c
   F:    drivers/irqchip/irq-or1k-*
@@@ -15899,7 -15839,7 +15900,7 @@@ W:   https://parisc.wiki.kernel.or
   Q:    http://patchwork.kernel.org/project/linux-parisc/list/
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
- -F:    Documentation/parisc/
+ +F:    Documentation/arch/parisc/
   F:    arch/parisc/
   F:    drivers/char/agp/parisc-agp.c
   F:    drivers/input/misc/hp_sdc_rtc.c
@@@ -15914,7 -15854,7 +15915,7 @@@ F:   drivers/video/logo/logo_parisc
   F:    include/linux/hp_sdc.h
   
   PARMAN
- -M:    Jiri Pirko <jiri@nvidia.com>
+ +M:    Jiri Pirko <jiri@resnulli.us>
   L:    netdev@vger.kernel.org
   S:    Supported
   F:    include/linux/parman.h
@@@ -16392,6 -16332,12 +16393,6 @@@ S:  Maintaine
   F:    crypto/pcrypt.c
   F:    include/crypto/pcrypt.h
   
- -PEAQ WMI HOTKEYS DRIVER
- -M:    Hans de Goede <hdegoede@redhat.com>
- -L:    platform-driver-x86@vger.kernel.org
- -S:    Maintained
- -F:    drivers/platform/x86/peaq-wmi.c
- -
   PECI HARDWARE MONITORING DRIVERS
   M:    Iwona Winiarska <iwona.winiarska@intel.com>
   L:    linux-hwmon@vger.kernel.org
@@@ -16446,7 -16392,6 +16447,7 @@@ R:   Alexander Shishkin <alexander.shishk
   R:    Jiri Olsa <jolsa@kernel.org>
   R:    Namhyung Kim <namhyung@kernel.org>
   R:    Ian Rogers <irogers@google.com>
+ +R:    Adrian Hunter <adrian.hunter@intel.com>
   L:    linux-perf-users@vger.kernel.org
   L:    linux-kernel@vger.kernel.org
   S:    Supported
@@@ -16828,8 -16773,9 +16829,8 @@@ F:   include/uapi/linux/if_pppol2tp.
   F:    net/l2tp/l2tp_ppp.c
   
   PPP PROTOCOL DRIVERS AND COMPRESSORS
- -M:    Paul Mackerras <paulus@samba.org>
   L:    linux-ppp@vger.kernel.org
- -S:    Maintained
+ +S:    Orphan
   F:    drivers/net/ppp/ppp_*
   
   PPS SUPPORT
@@@ -17073,7 -17019,7 +17074,7 @@@ QAT DRIVE
   M:    Giovanni Cabiddu <giovanni.cabiddu@intel.com>
   L:    qat-linux@intel.com
   S:    Supported
- -F:    drivers/crypto/qat/
+ +F:    drivers/crypto/intel/qat/
   
   QCOM AUDIO (ASoC) DRIVERS
   M:    Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
@@@ -17223,12 -17169,6 +17224,12 @@@ F: fs/qnx4
   F:    include/uapi/linux/qnx4_fs.h
   F:    include/uapi/linux/qnxtypes.h
   
+ +QNX6 FILESYSTEM
+ +S:    Orphan
+ +F:    Documentation/filesystems/qnx6.rst
+ +F:    fs/qnx6/
+ +F:    include/linux/qnx6_fs.h
+ +
   QORIQ DPAA2 FSL-MC BUS DRIVER
   M:    Stuart Yoder <stuyoder@gmail.com>
   M:    Laurentiu Tudor <laurentiu.tudor@nxp.com>
@@@ -17257,7 -17197,7 +17258,7 @@@ S:   Supporte
   W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
   F:    drivers/net/wireless/ath/ath10k/
- -F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt
+ +F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
   
   QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
   M:    Kalle Valo <kvalo@kernel.org>
@@@ -17293,7 -17233,6 +17294,7 @@@ F:   drivers/net/wwan/qcom_bam_dmux.
   QUALCOMM CAMERA SUBSYSTEM DRIVER
   M:    Robert Foss <rfoss@kernel.org>
   M:    Todor Tomov <todor.too@gmail.com>
+ +M:    Bryan O'Donoghue <bryan.odonoghue@linaro.org>
   L:    linux-media@vger.kernel.org
   S:    Maintained
   F:    Documentation/admin-guide/media/qcom_camss.rst
@@@ -17309,16 -17248,6 +17310,16 @@@ F: Documentation/devicetree/bindings/cl
   F:    drivers/clk/qcom/
   F:    include/dt-bindings/clock/qcom,*
   
+ +QUALCOMM CLOUD AI (QAIC) DRIVER
+ +M:    Jeffrey Hugo <quic_jhugo@quicinc.com>
+ +L:    linux-arm-msm@vger.kernel.org
+ +L:    dri-devel@lists.freedesktop.org
+ +S:    Supported
+ +T:    git git://anongit.freedesktop.org/drm/drm-misc
+ +F:    Documentation/accel/qaic/
+ +F:    drivers/accel/qaic/
+ +F:    include/uapi/drm/qaic_accel.h
+ +
   QUALCOMM CORE POWER REDUCTION (CPR) AVS DRIVER
   M:    Bjorn Andersson <andersson@kernel.org>
   M:    Konrad Dybcio <konrad.dybcio@linaro.org>
@@@ -17341,7 -17270,6 +17342,7 @@@ M:   Thara Gopinath <thara.gopinath@gmail
   L:    linux-crypto@vger.kernel.org
   L:    linux-arm-msm@vger.kernel.org
   S:    Maintained
+ +F:    Documentation/devicetree/bindings/crypto/qcom-qce.yaml
   F:    drivers/crypto/qce/
   
   QUALCOMM EMAC GIGABIT ETHERNET DRIVER
@@@ -17355,7 -17283,7 +17356,7 @@@ M:   Vinod Koul <vkoul@kernel.org
   R:    Bhupesh Sharma <bhupesh.sharma@linaro.org>
   L:    netdev@vger.kernel.org
   S:    Maintained
- -F:    Documentation/devicetree/bindings/net/qcom,ethqos.txt
+ +F:    Documentation/devicetree/bindings/net/qcom,ethqos.yaml
   F:    drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
   
   QUALCOMM FASTRPC DRIVER
@@@ -17615,7 -17543,7 +17616,7 @@@ F:   include/ras/ras_event.
   RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
   L:    linux-wireless@vger.kernel.org
   S:    Orphan
- -F:    drivers/net/wireless/ray*
+ +F:    drivers/net/wireless/legacy/ray*
   
   RC-CORE / LIRC FRAMEWORK
   M:    Sean Young <sean@mess.org>
@@@ -17701,7 -17629,7 +17702,7 @@@ M:   Fenghua Yu <fenghua.yu@intel.com
   M:    Reinette Chatre <reinette.chatre@intel.com>
   L:    linux-kernel@vger.kernel.org
   S:    Supported
- -F:    Documentation/x86/resctrl*
+ +F:    Documentation/arch/x86/resctrl*
   F:    arch/x86/include/asm/resctrl.h
   F:    arch/x86/kernel/cpu/resctrl/
   F:    tools/testing/selftests/resctrl/
@@@ -17710,13 -17638,11 +17711,13 @@@ READ-COPY UPDATE (RCU
   M:    "Paul E. McKenney" <paulmck@kernel.org>
   M:    Frederic Weisbecker <frederic@kernel.org> (kernel/rcu/tree_nocb.h)
   M:    Neeraj Upadhyay <quic_neeraju@quicinc.com> (kernel/rcu/tasks.h)
+ +M:    Joel Fernandes <joel@joelfernandes.org>
   M:    Josh Triplett <josh@joshtriplett.org>
+ +M:    Boqun Feng <boqun.feng@gmail.com>
   R:    Steven Rostedt <rostedt@goodmis.org>
   R:    Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
   R:    Lai Jiangshan <jiangshanlai@gmail.com>
- -R:    Joel Fernandes <joel@joelfernandes.org>
+ +R:    Zqiang <qiang1.zhang@intel.com>
   L:    rcu@vger.kernel.org
   S:    Supported
   W:    http://www.rdrop.com/users/paulmck/RCU/
@@@ -18064,7 -17990,7 +18065,7 @@@ F:   Documentation/devicetree/bindings/sp
   F:    Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml
   F:    arch/riscv/boot/dts/microchip/
   F:    drivers/char/hw_random/mpfs-rng.c
- -F:    drivers/clk/microchip/clk-mpfs.c
+ +F:    drivers/clk/microchip/clk-mpfs*.c
   F:    drivers/i2c/busses/i2c-microchip-corei2c.c
   F:    drivers/mailbox/mailbox-mpfs.c
   F:    drivers/pci/controller/pcie-microchip-host.c
@@@ -18365,9 -18291,8 +18366,9 @@@ F:   drivers/s390/block/dasd
   F:    include/linux/dasd_mod.h
   
   S390 IOMMU (PCI)
+ +M:    Niklas Schnelle <schnelle@linux.ibm.com>
   M:    Matthew Rosato <mjrosato@linux.ibm.com>
- -M:    Gerald Schaefer <gerald.schaefer@linux.ibm.com>
+ +R:    Gerald Schaefer <gerald.schaefer@linux.ibm.com>
   L:    linux-s390@vger.kernel.org
   S:    Supported
   F:    drivers/iommu/s390-iommu.c
@@@ -18562,6 -18487,7 +18563,6 @@@ F:   include/media/drv-intf/s3c_camif.
   
   SAMSUNG S3FWRN5 NFC DRIVER
   M:    Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
- -L:    linux-nfc@lists.01.org (subscribers-only)
   S:    Maintained
   F:    Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
   F:    drivers/nfc/s3fwrn5
@@@ -18571,7 -18497,6 +18572,7 @@@ M:   Sylwester Nawrocki <s.nawrocki@samsu
   M:    Andrzej Hajda <andrzej.hajda@intel.com>
   L:    linux-media@vger.kernel.org
   S:    Supported
+ +F:    Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml
   F:    drivers/media/i2c/s5c73m3/*
   
   SAMSUNG S5K5BAF CAMERA DRIVER
@@@ -18596,11 -18521,6 +18597,11 @@@ M: Sylwester Nawrocki <s.nawrocki@samsu
   L:    linux-media@vger.kernel.org
   S:    Supported
   Q:    https://patchwork.linuxtv.org/project/linux-media/list/
+ +F:    Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml
+ +F:    Documentation/devicetree/bindings/media/samsung,exynos4210-fimc.yaml
+ +F:    Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-is.yaml
+ +F:    Documentation/devicetree/bindings/media/samsung,exynos4212-fimc-lite.yaml
+ +F:    Documentation/devicetree/bindings/media/samsung,fimc.yaml
   F:    drivers/media/platform/samsung/exynos4-is/
   
   SAMSUNG SOC CLOCK DRIVERS
@@@ -18882,7 -18802,7 +18883,7 @@@ F:   include/uapi/linux/sed
   SECURITY CONTACT
   M:    Security Officers <security@kernel.org>
   S:    Supported
- -F:    Documentation/admin-guide/security-bugs.rst
+ +F:    Documentation/process/security-bugs.rst
   
   SECURITY SUBSYSTEM
   M:    Paul Moore <paul@paul-moore.com>
@@@ -18904,8 -18824,8 +18905,8 @@@ S:   Supporte
   W:    https://selinuxproject.org
   W:    https://github.com/SELinuxProject
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
- -F:    Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
- -F:    Documentation/ABI/obsolete/sysfs-selinux-disable
+ +F:    Documentation/ABI/removed/sysfs-selinux-checkreqprot
+ +F:    Documentation/ABI/removed/sysfs-selinux-disable
   F:    Documentation/admin-guide/LSM/SELinux.rst
   F:    include/trace/events/avc.h
   F:    include/uapi/linux/selinux_netlink.h
@@@ -18991,14 -18911,6 +18992,14 @@@ S: Supporte
   F:    Documentation/networking/devlink/sfc.rst
   F:    drivers/net/ethernet/sfc/
   
+ +SFCTEMP HWMON DRIVER
+ +M:    Emil Renner Berthing <kernel@esmil.dk>
+ +L:    linux-hwmon@vger.kernel.org
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
+ +F:    Documentation/hwmon/sfctemp.rst
+ +F:    drivers/hwmon/sfctemp.c
+ +
   SFF/SFP/SFP+ MODULE SUPPORT
   M:    Russell King <linux@armlinux.org.uk>
   L:    netdev@vger.kernel.org
@@@ -19087,7 -18999,6 +19088,7 @@@ L:   linux-media@vger.kernel.or
   S:    Odd Fixes
   W:    https://linuxtv.org
   T:    git git://linuxtv.org/media_tree.git
+ +F:    Documentation/devicetree/bindings/media/silabs,si470x.yaml
   F:    drivers/media/radio/si470x/radio-si470x-i2c.c
   
   SI470X FM RADIO RECEIVER USB DRIVER
@@@ -19163,6 -19074,7 +19164,7 @@@ M:   Conor Dooley <conor@kernel.org
   L:    linux-riscv@lists.infradead.org
   S:    Maintained
   T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
+ F:    Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
   F:    drivers/soc/sifive/
   
   SILEAD TOUCHSCREEN DRIVER
@@@ -19239,7 -19151,9 +19241,7 @@@ W:   http://www.brownhat.org/sis900.htm
   F:    drivers/net/ethernet/sis/sis900.*
   
   SIS FRAMEBUFFER DRIVER
- -M:    Thomas Winischhofer <thomas@winischhofer.net>
- -S:    Maintained
- -W:    http://www.winischhofer.net/linuxsisvga.shtml
+ +S:    Orphan
   F:    Documentation/fb/sisfb.rst
   F:    drivers/video/fbdev/sis/
   F:    include/video/sisfb.h
@@@ -19951,6 -19865,13 +19953,6 @@@ S:  Maintaine
   W:    http://wiki.laptop.org/go/DCON
   F:    drivers/staging/olpc_dcon/
   
- -STAGING - REALTEK RTL8188EU DRIVERS
- -M:    Larry Finger <Larry.Finger@lwfinger.net>
- -M:    Phillip Potter <phil@philpotter.co.uk>
- -R:    Pavel Skripkin <paskripkin@gmail.com>
- -S:    Supported
- -F:    drivers/staging/r8188eu/
- -
   STAGING - REALTEK RTL8712U DRIVERS
   M:    Larry Finger <Larry.Finger@lwfinger.net>
   M:    Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
@@@ -19994,13 -19915,6 +19996,13 @@@ M: Emil Renner Berthing <kernel@esmil.d
   S:    Maintained
   F:    arch/riscv/boot/dts/starfive/
   
+ +STARFIVE DWMAC GLUE LAYER
+ +M:    Emil Renner Berthing <kernel@esmil.dk>
+ +M:    Samin Guo <samin.guo@starfivetech.com>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
+ +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c
+ +
   STARFIVE JH7100 CLOCK DRIVERS
   M:    Emil Renner Berthing <kernel@esmil.dk>
   S:    Maintained
@@@ -20211,7 -20125,7 +20213,7 @@@ M:   John Paul Adrian Glaubitz <glaubitz@
   L:    linux-sh@vger.kernel.org
   S:    Maintained
   Q:    http://patchwork.kernel.org/project/linux-sh/list/
- -F:    Documentation/sh/
+ +F:    Documentation/arch/sh/
   F:    arch/sh/
   F:    drivers/sh/
   
@@@ -20271,7 -20185,7 +20273,7 @@@ M:   Vineet Gupta <vgupta@kernel.org
   L:    linux-snps-arc@lists.infradead.org
   S:    Supported
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git
- -F:    Documentation/arc/
+ +F:    Documentation/arch/arc
   F:    Documentation/devicetree/bindings/arc/*
   F:    Documentation/devicetree/bindings/interrupt-controller/snps,arc*
   F:    arch/arc/
@@@ -20741,6 -20655,7 +20743,6 @@@ F:   sound/soc/codecs/tscs*.
   TENSILICA XTENSA PORT (xtensa)
   M:    Chris Zankel <chris@zankel.net>
   M:    Max Filippov <jcmvbkbc@gmail.com>
- -L:    linux-xtensa@linux-xtensa.org
   S:    Maintained
   T:    git https://github.com/jcmvbkbc/linux-xtensa.git
   F:    arch/xtensa/
@@@ -20870,7 -20785,7 +20872,7 @@@ L:   linux-pm@vger.kernel.or
   S:    Maintained
   F:    Documentation/driver-api/thermal/power_allocator.rst
   F:    drivers/thermal/gov_power_allocator.c
- -F:    include/trace/events/thermal_power_allocator.h
+ +F:    drivers/thermal/thermal_trace_ipa.h
   
   THINKPAD ACPI EXTRAS DRIVER
   M:    Henrique de Moraes Holschuh <hmh@hmh.eng.br>
@@@ -21076,6 -20991,7 +21078,6 @@@ F:   drivers/iio/magnetometer/tmag5273.
   TI TRF7970A NFC DRIVER
   M:    Mark Greer <mgreer@animalcreek.com>
   L:    linux-wireless@vger.kernel.org
- -L:    linux-nfc@lists.01.org (subscribers-only)
   S:    Supported
   F:    Documentation/devicetree/bindings/net/nfc/ti,trf7970a.yaml
   F:    drivers/nfc/trf7970a.c
@@@ -21167,6 -21083,7 +21169,6 @@@ F:   Documentation/hwmon/tmp401.rs
   F:    drivers/hwmon/tmp401.c
   
   TMP464 HARDWARE MONITOR DRIVER
- -M:    Agathe Porte <agathe.porte@nokia.com>
   M:    Guenter Roeck <linux@roeck-us.net>
   L:    linux-hwmon@vger.kernel.org
   S:    Maintained
@@@ -21329,14 -21246,6 +21331,14 @@@ S: Maintaine
   F:    Documentation/tools/rtla/
   F:    tools/tracing/rtla/
   
+ +TECHNICAL ADVISORY BOARD PROCESS DOCS
+ +M:    "Theodore Ts'o" <tytso@mit.edu>
+ +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+ +L:    tech-board-discuss@lists.linux-foundation.org
+ +S:    Maintained
+ +F:    Documentation/process/researcher-guidelines.rst
+ +F:    Documentation/process/contribution-maturity-model.rst
+ +
   TRADITIONAL CHINESE DOCUMENTATION
   M:    Hu Haowen <src.res@email.cn>
   L:    linux-doc-tw-discuss@lists.sourceforge.net (moderated for non-subscribers)
@@@ -21744,7 -21653,6 +21746,7 @@@ USB OVER IP DRIVE
   M:    Valentina Manea <valentina.manea.m@gmail.com>
   M:    Shuah Khan <shuah@kernel.org>
   M:    Shuah Khan <skhan@linuxfoundation.org>
+ +R:    Hongren Zheng <i@zenithal.me>
   L:    linux-usb@vger.kernel.org
   S:    Maintained
   F:    Documentation/usb/usbip_protocol.rst
@@@ -21891,7 -21799,7 +21893,7 @@@ USB WIRELESS RNDIS DRIVER (rndis_wlan
   M:    Jussi Kivilinna <jussi.kivilinna@iki.fi>
   L:    linux-wireless@vger.kernel.org
   S:    Maintained
- -F:    drivers/net/wireless/rndis_wlan.c
+ +F:    drivers/net/wireless/legacy/rndis_wlan.c
   
   USB XHCI DRIVER
   M:    Mathias Nyman <mathias.nyman@intel.com>
@@@ -22270,9 -22178,7 +22272,9 @@@ L:   virtualization@lists.linux-foundatio
   L:    netdev@vger.kernel.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
+ +F:    kernel/vhost_task.c
   F:    drivers/vhost/
+ +F:    include/linux/sched/vhost_task.h
   F:    include/linux/vhost_iotlb.h
   F:    include/uapi/linux/vhost.h
   
@@@ -22647,7 -22553,7 +22649,7 @@@ F:   drivers/input/misc/wistron_btns.
   WL3501 WIRELESS PCMCIA CARD DRIVER
   L:    linux-wireless@vger.kernel.org
   S:    Odd fixes
- -F:    drivers/net/wireless/wl3501*
+ +F:    drivers/net/wireless/legacy/wl3501*
   
   WOLFSON MICROELECTRONICS DRIVERS
   L:    patches@opensource.cirrus.com
@@@ -22746,7 -22652,7 +22748,7 @@@ L:   linux-kernel@vger.kernel.or
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
   F:    Documentation/devicetree/bindings/x86/
- -F:    Documentation/x86/
+ +F:    Documentation/arch/x86/
   F:    arch/x86/
   
   X86 ENTRY CODE
@@@ -22756,24 -22662,13 +22758,24 @@@ S:        Maintaine
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/asm
   F:    arch/x86/entry/
   
+ +X86 HARDWARE VULNERABILITIES
+ +M:    Thomas Gleixner <tglx@linutronix.de>
+ +M:    Borislav Petkov <bp@alien8.de>
+ +M:    Peter Zijlstra <peterz@infradead.org>
+ +M:    Josh Poimboeuf <jpoimboe@kernel.org>
+ +R:    Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
+ +S:    Maintained
+ +F:    Documentation/admin-guide/hw-vuln/
+ +F:    arch/x86/include/asm/nospec-branch.h
+ +F:    arch/x86/kernel/cpu/bugs.c
+ +
   X86 MCE INFRASTRUCTURE
   M:    Tony Luck <tony.luck@intel.com>
   M:    Borislav Petkov <bp@alien8.de>
   L:    linux-edac@vger.kernel.org
   S:    Maintained
   F:    Documentation/ABI/testing/sysfs-mce
- -F:    Documentation/x86/x86_64/machinecheck.rst
+ +F:    Documentation/arch/x86/x86_64/machinecheck.rst
   F:    arch/x86/kernel/cpu/mce/*
   
   X86 MICROCODE UPDATE SUPPORT
@@@ -22795,7 -22690,7 +22797,7 @@@ M:   Hans de Goede <hdegoede@redhat.com
   L:    platform-driver-x86@vger.kernel.org
   S:    Maintained
   T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
- -F:    drivers/platform/x86/x86-android-tablets.c
+ +F:    drivers/platform/x86/x86-android-tablets/
   
   X86 PLATFORM DRIVERS
   M:    Hans de Goede <hdegoede@redhat.com>
@@@ -23144,6 -23039,7 +23146,6 @@@ F:   drivers/i2c/busses/i2c-xlp9xx.
   
   XRA1403 GPIO EXPANDER
   M:    Nandor Han <nandor.han@ge.com>
- -M:    Semi Malinen <semi.malinen@ge.com>
   L:    linux-gpio@vger.kernel.org
   S:    Maintained
   F:    Documentation/devicetree/bindings/gpio/gpio-xra1403.txt
@@@ -23151,6 -23047,7 +23153,6 @@@ F:   drivers/gpio/gpio-xra1403.
   
   XTENSA XTFPGA PLATFORM SUPPORT
   M:    Max Filippov <jcmvbkbc@gmail.com>
- -L:    linux-xtensa@linux-xtensa.org
   S:    Maintained
   F:    drivers/spi/spi-xtensa-xtfpga.c
   F:    sound/soc/xtensa/xtfpga-i2s.c
@@@ -23233,7 -23130,7 +23235,7 @@@ S:   Maintaine
   F:    arch/x86/kernel/cpu/zhaoxin.c
   
   ZONEFS FILESYSTEM
- -M:    Damien Le Moal <damien.lemoal@opensource.wdc.com>
+ +M:    Damien Le Moal <dlemoal@kernel.org>
   M:    Naohiro Aota <naohiro.aota@wdc.com>
   R:    Johannes Thumshirn <jth@kernel.org>
   L:    linux-fsdevel@vger.kernel.org
@@@ -23301,13 -23198,6 +23303,13 @@@ L: linux-mm@kvack.or
   S:    Maintained
   F:    mm/zswap.c
   
+ +NXP BLUETOOTH WIRELESS DRIVERS
+ +M:    Amitkumar Karwar <amitkumar.karwar@nxp.com>
+ +M:    Neeraj Kale <neeraj.sanjaykale@nxp.com>
+ +S:    Maintained
+ +F:    Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml
+ +F:    drivers/bluetooth/btnxpuart.c
+ +
   THE REST
   M:    Linus Torvalds <torvalds@linux-foundation.org>
   L:    linux-kernel@vger.kernel.org
author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 27 Apr 2023 16:23:57 +0000 (09:23 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 27 Apr 2023 16:23:57 +0000 (09:23 -0700)
		1	2
Documentation/devicetree/bindings/arm/cpus.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/cache/qcom,llcc.yaml	patch \|	\|	diff2 \|	blob \| history
Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/media/renesas,vin.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/media/ti,cal.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/net/mdio-gpio.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/soc/renesas/renesas.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/vendor-prefixes.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/watchdog/apple,wdt.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/watchdog/snps,dw-wdt.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history