From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robh@kernel.org>, Andy Gross <agross@kernel.org>
Cc: Abel Vesa <abel.vesa@linaro.org>,
Bjorn Andersson <andersson@kernel.org>,
Jingyi Wang <quic_jingyw@quicinc.com>,
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 devicetree tree with the qcom tree
Date: Tue, 5 Nov 2024 14:44:35 +1100 [thread overview]
Message-ID: <20241105144435.1d80d910@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/cache/qcom,llcc.yaml
between commit:
a83e18ca8358 ("dt-bindings: cache: qcom,llcc: Document the QCS8300 LLCC")
from the qcom tree and commit:
f9759e2b5704 ("dt-bindings: cache: qcom,llcc: Fix X1E80100 reg entries")
from the devicetree tree.
I fixed it up (the 3 way diff comes out empty) 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:[~2024-11-05 3:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-05 3:44 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-03-19 13:46 linux-next: manual merge of the devicetree tree with the qcom tree Mark Brown
2026-03-17 16:19 Mark Brown
2026-03-17 17:09 ` Geert Uytterhoeven
2018-10-02 3:31 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=20241105144435.1d80d910@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=abel.vesa@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=quic_jingyw@quicinc.com \
--cc=robh@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