From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kishon Vijay Abraham I <kishon@ti.com>,
Vinod Koul <vkoul@kernel.org>, Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shawn Guo <shawn.guo@linaro.org>,
Stephan Gerhold <stephan@gerhold.net>
Subject: linux-next: manual merge of the phy-next tree with the gcom tree
Date: Tue, 26 Oct 2021 15:44:15 +1100 [thread overview]
Message-ID: <20211026154415.3f6c7c28@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 813 bytes --]
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
between commit:
442ee1fc60c4 ("arm64: dts: qcom: Drop unneeded extra device-specific includes")
from the gcom tree and commit:
956bbf2a94e8 ("arm64: dts: qcom: Add missing vdd-supply for QUSB2 PHY")
from the phy-next tree.
I fixed it up (the former removed the file, so I did that) 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-10-26 4:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 4:44 Stephen Rothwell [this message]
2021-10-26 6:28 ` linux-next: manual merge of the phy-next tree with the gcom tree Stephan Gerhold
2021-10-26 11:05 ` Vinod Koul
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=20211026154415.3f6c7c28@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shawn.guo@linaro.org \
--cc=stephan@gerhold.net \
--cc=vkoul@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