linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Greg KH <greg@kroah.com>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Sandeep Maheswaram <sanm@codeaurora.org>,
	Shaik Sajida Bhanu <sbhanu@codeaurora.org>
Subject: linux-next: manual merge of the usb tree with the qcom tree
Date: Fri,  6 Aug 2021 15:13:12 +0100	[thread overview]
Message-ID: <20210806141312.23309-1-broonie@kernel.org> (raw)

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  arch/arm64/boot/dts/qcom/sc7280.dtsi

between commit:

  298c81a7d44f ("arm64: dts: qcom: sc7280: Add nodes for eMMC and SD card")

from the qcom tree and commit:

  bb9efa59c665 ("arm64: dts: qcom: sc7280: Add USB related nodes")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/arm64/boot/dts/qcom/sc7280.dtsi
index 53a21d086178,cd6908f3fd09..000000000000
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi

             reply	other threads:[~2021-08-06 14:13 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-06 14:13 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-02-14  1:40 linux-next: manual merge of the usb tree with the qcom tree 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-09-21  2:30 Stephen Rothwell
2021-09-21 13:12 ` Bjorn Andersson
2021-09-21 13:16   ` Greg KH
2021-09-21 13:28     ` Bjorn Andersson
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=20210806141312.23309-1-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sanm@codeaurora.org \
    --cc=sbhanu@codeaurora.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).