Commit a13fee31 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge v6.7-rc3 into drm-next 



Thomas Zimermann needs 8d6ef265 ("drm/ast: Disconnect BMC if
physical connector is connected") for further ast work in -next.

Minor conflicts in ivpu between 3de6d959 ("accel/ivpu: Pass D0i3
residency time to the VPU firmware") and 3f7c0634
("accel/ivpu/37xx: Fix hangs related to MMIO reset") changing adjacent
lines.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 221d6546 2cc14f52

Documentation/arch/loongarch/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -375,9 +375,9 @@ Developer web site of Loongson and LoongArch (Software and Documentation): 


Documentation of LoongArch ISA:



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-CN.pdf (in Chinese)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-CN.pdf (in Chinese)



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.02-EN.pdf (in English)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-Vol1-v1.10-EN.pdf (in English)



Documentation of LoongArch ELF psABI:

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>;

Documentation/filesystems/erofs.rst

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ compatibility checking tool (fsck.erofs), and a debugging tool (dump.erofs): 


- git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git



For more information, please also refer to the documentation site:



- https://erofs.docs.kernel.org



Bugs and patches are welcome, please kindly help us and send to the following

linux-erofs mailing list: