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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 9 Aug 2021 09:02:52 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Andy Gross <agross@...nel.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        AngeloGioacchino Del Regno 
        <angelogioacchino.delregno@...ainline.org>
Subject: 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 <broonie@...nel.org> wrote:
>
> On Fri, Aug 06, 2021 at 01:08:26PM +0200, Greg Kroah-Hartman wrote:
> > On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:  
> 
> > > 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@...0000 {
 -			usb3_dwc3: usb@...0000 {
++			usb3_dwc3: dwc3@...0000 {
  				compatible = "snps,dwc3";
  				reg = <0x06a00000 0xcc00>;
  				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;

Content of type "application/pgp-signature" skipped