From: Mark Brown <broonie@kernel.org>
To: Jassi Brar <jassisinghbrar@gmail.com>
Cc: Bjorn Andersson <andersson@kernel.org>,
Jagadeesh Kona <jagadeesh.kona@oss.qualcomm.com>,
Jingyi Wang <jingyi.wang@oss.qualcomm.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 mailbox tree with the qcom tree
Date: Mon, 26 Jan 2026 21:42:44 +0000 [thread overview]
Message-ID: <aXff1Fr89fqs5CEO@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]
Hi all,
Today's linux-next merge of the mailbox tree got a conflict in:
Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
between commits:
65ce09d2f164a ("dt-bindings: mailbox: qcom: Document SM8750 CPUCP mailbox controller")
58e69e8f9c9a4 ("dt-bindings: mailbox: qcom: Add CPUCP mailbox controller bindings for Kaanapali")
from the qcom tree and commit:
d96ebba37b7d0 ("dt-bindings: mailbox: qcom: Add CPUCP mailbox controller bindings for Kaanapali")
from the mailbox 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 Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
index 90bfde66cc4a6,9e91247c521a1..0000000000000
--- a/Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-26 21:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-26 21:42 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 23:31 linux-next: manual merge of the mailbox tree with the qcom tree 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=aXff1Fr89fqs5CEO@sirena.org.uk \
--to=broonie@kernel.org \
--cc=andersson@kernel.org \
--cc=jagadeesh.kona@oss.qualcomm.com \
--cc=jassisinghbrar@gmail.com \
--cc=jingyi.wang@oss.qualcomm.com \
--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