Re: linux-next: manual merge of the qcom tree with the usb tree

Hi Mark,

On Fri, 6 Aug 2021 12:23:53 +0100 Mark Brown [off-list ref] wrote:

On Fri, Aug 06, 2021 at 01:08:26PM +0200, Greg Kroah-Hartman wrote:

quoted

On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:  

quoted

quoted

diff --cc arch/arm64/boot/dts/qcom/msm8996.dtsi
index 78c55ca10ba9,31686950004e..000000000000

--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi  

Love the fix, did something go wrong?  :)  

The fix will be whatever was in HEAD.

I used the following instead.  Is that wrong?

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/boot/dts/qcom/msm8996.dtsi
index 78c55ca10ba9,31686950004e..000000000000

--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi

@@@ -2566,7 -2572,7 +2572,7 @@@
  			power-domains = <&gcc USB30_GDSC>;
  			status = "disabled";
  
- 			dwc3@6a00000 {
 -			usb3_dwc3: usb@6a00000 {
++			usb3_dwc3: dwc3@6a00000 {
  				compatible = "snps,dwc3";
  				reg = <0x06a00000 0xcc00>;
  				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;