]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge 6.18-rc3 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Oct 2025 07:33:01 +0000 (08:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Oct 2025 07:33:01 +0000 (08:33 +0100)
We need the USB fixes in here as well to build on top of.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
Documentation/devicetree/bindings/usb/qcom,snps-dwc3.yaml
MAINTAINERS
drivers/usb/dwc3/dwc3-generic-plat.c
drivers/usb/typec/tcpm/tcpm.c

index a6c1bfb33c39bc025b718caca1ef5f6d61fd6f35,d49a58d5478ff30f33df35d8c00c03deefedf3c4..301e873684ae958f08b015398a768e8a693bab22
@@@ -67,8 -67,8 +67,9 @@@ properties
            - qcom,sm8450-dwc3
            - qcom,sm8550-dwc3
            - qcom,sm8650-dwc3
 +          - qcom,sm8750-dwc3
            - qcom,x1e80100-dwc3
+           - qcom,x1e80100-dwc3-mp
        - const: qcom,snps-dwc3
  
    reg:
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge