From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Andy Gross <agross@kernel.org>
Cc: Baruch Siach <baruch@tkos.co.il>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kathiravan T <kathirav@codeaurora.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the usb tree with the qcom tree
Date: Tue, 21 Sep 2021 12:30:32 +1000 [thread overview]
Message-ID: <20210921123032.02cd498b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 892 bytes --]
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")
from the usb tree.
Same author, same date, but the former has this committer comment:
bjorn: Changed dwc3 node name to usb, per binding
So I used that version.
I fixed it up (see above) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-09-21 2:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 2:30 Stephen Rothwell [this message]
2021-09-21 13:12 ` linux-next: manual merge of the usb tree with the qcom tree Bjorn Andersson
2021-09-21 13:16 ` Greg KH
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=20210921123032.02cd498b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agross@kernel.org \
--cc=baruch@tkos.co.il \
--cc=bjorn.andersson@linaro.org \
--cc=greg@kroah.com \
--cc=gregkh@linuxfoundation.org \
--cc=kathirav@codeaurora.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).