linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Andy Gross <agross@kernel.org>, Baruch Siach <baruch@tkos.co.il>,
	Kathiravan T <kathirav@codeaurora.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the qcom tree
Date: Tue, 21 Sep 2021 15:16:27 +0200	[thread overview]
Message-ID: <YUnbK840c9L6vpAl@kroah.com> (raw)
In-Reply-To: <YUnaJolAAZmhs4kU@ripper>

On Tue, Sep 21, 2021 at 06:12:06AM -0700, Bjorn Andersson wrote:
> On Mon 20 Sep 19:30 PDT 2021, Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Today's linux-next merge of the usb tree got a conflict in:
> > 
> >   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> > 
> > between commit:
> > 
> >   261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description")
> > 
> > from the qcom tree and commit:
> > 
> >   9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description")
> > 
> 
> Greg, this is not a USB patch, can you please drop it from your tree.

It was sent to me and says "add usb3 DT description", so how am I
supposed to know to reject it?

I'll go revert it from my tree.  {sigh}

greg k-h

  reply	other threads:[~2021-09-21 13:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-21  2:30 linux-next: manual merge of the usb tree with the qcom tree Stephen Rothwell
2021-09-21 13:12 ` Bjorn Andersson
2021-09-21 13:16   ` Greg KH [this message]
2021-09-21 13:28     ` Bjorn Andersson
  -- strict thread matches above, loose matches on Subject: below --
2023-02-14  1:40 Stephen Rothwell
2023-02-14  6:46 ` Greg KH
2023-02-21  9:43 ` Geert Uytterhoeven
2022-02-21 19:16 broonie
2022-02-22  7:44 ` Greg KH
2022-02-10  3:11 Stephen Rothwell
2022-02-10  8:02 ` Greg KH
2022-03-18  7:37   ` Stephen Rothwell
2021-08-06 14:13 Mark Brown
2021-08-06 14:09 Mark Brown

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=YUnbK840c9L6vpAl@kroah.com \
    --to=greg@kroah.com \
    --cc=agross@kernel.org \
    --cc=baruch@tkos.co.il \
    --cc=bjorn.andersson@linaro.org \
    --cc=kathirav@codeaurora.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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).