Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc4

Cross-merge BPF and other fixes after downstream PR. No conflicts. Signed-off-by: Alexei Starovoitov <ast@kernel.org>
2026-08-13 14:19:53 -07:00 · 2025-11-03 14:59:55 -08:00
parent e6e10c51fb 6146a0f1df
commit 5dae7453ec
500 changed files with 4677 additions and 2435 deletions
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk>
 Alan Cox <root@hraefn.swansea.linux.org.uk>
 Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
 Aleksey Gorelov <aleksey_gorelov@phoenix.com>
+Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>
 Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
 Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
 Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
@@ -643,6 +644,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
 Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
 Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
 Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
+Rae Moar <raemoar63@gmail.com> <rmoar@google.com>
 Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
 Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
 Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a
 S: 602 00 Brno
 S: Czech Republic

+N: Karsten Keil
+E: isdn@linux-pingi.de
+D: ISDN subsystem maintainer
+
 N: Jakob Kemi
 E: jakob.kemi@telia.com
 D: V4L W9966 Webcam driver
@@ -180,9 +180,9 @@ allOf:
    then:
      properties:
        reg:
-          minItems: 2
+          maxItems: 2
        reg-names:
-          minItems: 2
+          maxItems: 2
    else:
      properties:
        reg:
@@ -142,7 +142,9 @@ allOf:
      required:
        - orientation-switch
    then:
-      $ref: /schemas/usb/usb-switch.yaml#
+      allOf:
+        - $ref: /schemas/usb/usb-switch.yaml#
+        - $ref: /schemas/usb/usb-switch-ports.yaml#

 unevaluatedProperties: false

@@ -24,6 +24,10 @@ properties:
          - enum:
              - qcom,qcs8300-qmp-ufs-phy
          - const: qcom,sa8775p-qmp-ufs-phy
+      - items:
+          - enum:
+              - qcom,kaanapali-qmp-ufs-phy
+          - const: qcom,sm8750-qmp-ufs-phy
      - enum:
          - qcom,msm8996-qmp-ufs-phy
          - qcom,msm8998-qmp-ufs-phy
@@ -125,7 +125,9 @@ allOf:
          contains:
            const: google,gs101-usb31drd-phy
    then:
-      $ref: /schemas/usb/usb-switch.yaml#
+      allOf:
+        - $ref: /schemas/usb/usb-switch.yaml#
+        - $ref: /schemas/usb/usb-switch-ports.yaml#

      properties:
        clocks:
@@ -197,6 +197,7 @@ allOf:
              - renesas,rcar-gen2-scif
              - renesas,rcar-gen3-scif
              - renesas,rcar-gen4-scif
+              - renesas,rcar-gen5-scif
    then:
      properties:
        interrupts:
@@ -32,7 +32,7 @@ properties:

    $ref: /schemas/types.yaml#/definitions/uint32-array
    minItems: 2
-    maxItems: 2
+    maxItems: 4
    items:
      enum: [1, 2, 3, 4]

@@ -48,7 +48,7 @@ properties:

    $ref: /schemas/types.yaml#/definitions/uint32-array
    minItems: 2
-    maxItems: 2
+    maxItems: 5
    items:
      enum: [1, 2, 3, 4, 5]

@@ -14,9 +14,14 @@ allOf:

 properties:
  compatible:
-    enum:
-      - cdns,spi-r1p6
-      - xlnx,zynq-spi-r1p6
+    oneOf:
+      - enum:
+          - xlnx,zynq-spi-r1p6
+      - items:
+          - enum:
+              - xlnx,zynqmp-spi-r1p6
+              - xlnx,versal-net-spi-r1p6
+          - const: cdns,spi-r1p6

  reg:
    maxItems: 1
@@ -34,6 +34,7 @@ properties:
              - rockchip,rk3328-spi
              - rockchip,rk3368-spi
              - rockchip,rk3399-spi
+              - rockchip,rk3506-spi
              - rockchip,rk3528-spi
              - rockchip,rk3562-spi
              - rockchip,rk3568-spi
@@ -15,6 +15,7 @@ select:
    compatible:
      contains:
        enum:
+          - qcom,kaanapali-ufshc
          - qcom,sm8650-ufshc
          - qcom,sm8750-ufshc
  required:
@@ -24,6 +25,7 @@ properties:
  compatible:
    items:
      - enum:
+          - qcom,kaanapali-ufshc
          - qcom,sm8650-ufshc
          - qcom,sm8750-ufshc
      - const: qcom,ufshc
@@ -76,6 +76,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -89,13 +89,21 @@ required:
  - reg
  - "#address-cells"
  - "#size-cells"
-  - dma-ranges
  - ranges
  - clocks
  - clock-names
  - interrupts
  - power-domains

+allOf:
+  - if:
+      properties:
+        compatible:
+          const: fsl,imx8mp-dwc3
+    then:
+      required:
+        - dma-ranges
+
 additionalProperties: false

 examples:
@@ -52,6 +52,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#
  - if:
      required:
        - mode-switch
@@ -46,6 +46,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -91,6 +91,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -81,6 +81,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -68,6 +68,7 @@ properties:
          - qcom,sm8550-dwc3
          - qcom,sm8650-dwc3
          - qcom,x1e80100-dwc3
+          - qcom,x1e80100-dwc3-mp
      - const: qcom,snps-dwc3

  reg:
@@ -460,8 +461,10 @@ allOf:
    then:
      properties:
        interrupts:
+          minItems: 4
          maxItems: 5
        interrupt-names:
+          minItems: 4
          items:
            - const: dwc_usb3
            - const: pwr_event
@@ -60,6 +60,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -11,6 +11,7 @@ maintainers:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 properties:
  compatible:
--- a/Show More
+++ b/Show More