Commit 1a2352ad authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Cross-merge networking fixes after downstream PR (net-6.18-rc4).

No conflicts, adjacent changes:

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  ded9813d ("net: stmmac: Consider Tx VLAN offload tag length for maxSDU")
  26ab9830 ("net: stmmac: replace has_xxxx with core_type")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0d0eb186 e5763491

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml

+2 −2
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ allOf: 
    then:

      properties:

        reg:

          minItems: 2

          maxItems: 2

        reg-names:

          minItems: 2

          maxItems: 2

    else:

      properties:

        reg:

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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

Documentation/devicetree/bindings/phy/samsung,usb3-drd-phy.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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:

Documentation/devicetree/bindings/serial/renesas,scif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ allOf: 
              - renesas,rcar-gen2-scif

              - renesas,rcar-gen3-scif

              - renesas,rcar-gen4-scif

              - renesas,rcar-gen5-scif

    then:

      properties:

        interrupts: