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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1400 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 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mark Brown]

[-- 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 --]