From: broonie@kernel.org
To: Greg KH <greg@kroah.com>
Cc: Baruch Siach <baruch@tkos.co.il>,
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>,
Sean Anderson <sean.anderson@seco.com>
Subject: linux-next: manual merge of the usb tree with the qcom tree
Date: Mon, 21 Feb 2022 19:16:41 +0000 [thread overview]
Message-ID: <20220221191641.1661387-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/ipq6018.dtsi
between commit:
d1c10ab1494f0 ("arm64: dts: qcom: ipq6018: fix usb reference period")
from the qcom tree and commit:
5726079cd4860 ("arm64: dts: ipq6018: Use reference clock to set dwc3 period")
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/ipq6018.dtsi
index 4e7efa97724bd,a614b9f73e2cd..0000000000000
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
(deleted the property updated by the qcom patch)
next reply other threads:[~2022-02-21 19:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 19:16 broonie [this message]
2022-02-22 7:44 ` linux-next: manual merge of the usb tree with the qcom tree Greg KH
-- 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-10 3:11 Stephen Rothwell
2022-02-10 8:02 ` Greg KH
2022-03-18 7:37 ` Stephen Rothwell
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: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=20220221191641.1661387-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=baruch@tkos.co.il \
--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=sean.anderson@seco.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.