linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	AngeloGioacchino Del Regno 
	<angelogioacchino.delregno@somainline.org>
Subject: Re: linux-next: manual merge of the qcom tree with the usb tree
Date: Mon, 9 Aug 2021 09:02:52 +1000	[thread overview]
Message-ID: <20210809090252.477dd77b@canb.auug.org.au> (raw)
In-Reply-To: <20210806112353.GA33586@sirena.org.uk>

[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]

Hi Mark,

On Fri, 6 Aug 2021 12:23:53 +0100 Mark Brown <broonie@kernel.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@6a00000 {
 -			usb3_dwc3: usb@6a00000 {
++			usb3_dwc3: dwc3@6a00000 {
  				compatible = "snps,dwc3";
  				reg = <0x06a00000 0xcc00>;
  				interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

      reply	other threads:[~2021-08-08 23:03 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-06 10:21 linux-next: manual merge of the qcom tree with the usb tree Mark Brown
2021-08-06 11:08 ` Greg Kroah-Hartman
2021-08-06 11:23   ` Mark Brown
2021-08-08 23:02     ` Stephen Rothwell [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210809090252.477dd77b@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=agross@kernel.org \
    --cc=angelogioacchino.delregno@somainline.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=broonie@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).