linux-kernel - linux-next: manual merge of the mailbox tree with the qcom tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20260106103123.2324639a@canb.auug.org.au>
Date: Tue, 6 Jan 2026 10:31:23 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jassi Brar <jassisinghbrar@...il.com>, Andy Gross <agross@...nel.org>
Cc: Bjorn Andersson <andersson@...nel.org>, Jagadeesh Kona
 <jagadeesh.kona@....qualcomm.com>, Jingyi Wang
 <jingyi.wang@....qualcomm.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the mailbox tree with the qcom tree

Hi all,

Today's linux-next merge of the mailbox tree got a conflict in:

  Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml

between commit:

  65ce09d2f164 ("dt-bindings: mailbox: qcom: Document SM8750 CPUCP mailbox controller")

from the qcom tree and commit:

  945dc11a38a0 ("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.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
index 9d99af46e531,9e91247c521a..000000000000
--- a/Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml
@@@ -19,7 -19,7 +19,8 @@@ properties
        - items:
            - enum:
                - qcom,glymur-cpucp-mbox
+               - qcom,kaanapali-cpucp-mbox
 +              - qcom,sm8750-cpucp-mbox
            - const: qcom,x1e80100-cpucp-mbox
        - enum:
            - qcom,x1e80100-cpucp-mbox

Content of type "application/pgp-signature" skipped