From: Matthias Kaehlcke <mka@chromium.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
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>
Subject: Re: linux-next: manual merge of the usb tree with the arm-soc tree
Date: Thu, 17 Jun 2021 09:34:21 -0700 [thread overview]
Message-ID: <YMt5jTLYv+DKWKdn@google.com> (raw)
In-Reply-To: <20210617144346.564be887@canb.auug.org.au>
On Thu, Jun 17, 2021 at 02:43:46PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got conflicts in:
>
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts
> arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
>
> between commit:
>
> 39441f73d91a ("arm64: dts: qcom: sc7180: lazor: Simplify disabling of charger thermal zone")
>
> from the arm-soc tree and commit:
>
> 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor: Add nodes for onboard USB hub")
>
> 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.
Thanks Stephen for fixing this up for -next!
One option would be to revert 1da8116eb0c5 ("arm64: dts: qcom: sc7180-trogdor:
Add nodes for onboard USB hub") from usb-next and land it through the qcom/arm-soc
tree with the rest of the SC7180 device tree patches.
Greg/Bjorn, does the above sound like a suitable solution to you or do you
think it would be better to deal with the conflict in a different way?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-17 16:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 4:43 linux-next: manual merge of the usb tree with the arm-soc tree Stephen Rothwell
2021-06-17 16:34 ` Matthias Kaehlcke [this message]
2021-06-17 17:30 ` Bjorn Andersson
2021-06-18 6:35 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2014-07-24 6:28 Stephen Rothwell
2014-07-24 6:33 ` Stephen Rothwell
2014-07-24 6:42 ` Greg KH
2014-07-24 15:39 ` Olof Johansson
2014-03-03 7:13 Stephen Rothwell
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=YMt5jTLYv+DKWKdn@google.com \
--to=mka@chromium.org \
--cc=arnd@arndb.de \
--cc=bjorn.andersson@linaro.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--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).