Commit 975f2d73 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.

No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f9893fda 6172a518

Documentation/ABI/testing/sysfs-class-led

+0 −9
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ Description: 
		brightness. Reading this file when no hw brightness change

		event has happened will return an ENODATA error.



What:		/sys/class/leds/<led>/color

Date:		June 2023

KernelVersion:	6.5

Description:

		Color of the LED.



		This is a read-only file. Reading this file returns the color

		of the LED as a string (e.g: "red", "green", "multicolor").



What:		/sys/class/leds/<led>/trigger

Date:		March 2006

KernelVersion:	2.6.17

Documentation/devicetree/bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ title: NXP S32G2 pin controller 


maintainers:

  - Ghennadi Procopciuc <Ghennadi.Procopciuc@oss.nxp.com>

  - Chester Lin <clin@suse.com>

  - Chester Lin <chester62515@gmail.com>



description: |

  S32G2 pinmux is implemented in SIUL2 (System Integration Unit Lite2),

Documentation/devicetree/bindings/usb/microchip,usb5744.yaml

+6 −1
Original line number Diff line number Diff line
@@ -36,7 +36,11 @@ properties: 


  vdd-supply:

    description:

      VDD power supply to the hub

      3V3 power supply to the hub



  vdd2-supply:

    description:

      1V2 power supply to the hub



  peer-hub:

    $ref: /schemas/types.yaml#/definitions/phandle
@@ -62,6 +66,7 @@ allOf: 
      properties:

        reset-gpios: false

        vdd-supply: false

        vdd2-supply: false

        peer-hub: false

        i2c-bus: false

    else:

Documentation/devicetree/bindings/usb/qcom,dwc3.yaml

+2 −2
Original line number Diff line number Diff line
@@ -521,8 +521,8 @@ examples: 


            interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 486 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 488 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 489 IRQ_TYPE_LEVEL_HIGH>;

                         <GIC_SPI 488 IRQ_TYPE_EDGE_BOTH>,

                         <GIC_SPI 489 IRQ_TYPE_EDGE_BOTH>;

            interrupt-names = "hs_phy_irq", "ss_phy_irq",

                          "dm_hs_phy_irq", "dp_hs_phy_irq";

Documentation/devicetree/bindings/usb/usb-hcd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ examples: 
  - |

    usb {

        phys = <&usb2_phy1>, <&usb3_phy1>;

        phy-names = "usb";

        phy-names = "usb2", "usb3";

        #address-cells = <1>;

        #size-cells = <0>;