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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3067 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml

between commit:

  b20eee62ee89 ("dt-bindings: mailbox: qcom-ipcc: add missing properties into example")

from the devicetree tree and commit:

  cd285535b8ee ("dt-bindings: mailbox: qcom-ipcc: simplify the example")

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-ipcc.yaml
index 50f9aa72c670,dfdc72345a2a..000000000000
--- a/Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
@@@ -62,28 -61,14 +62,28 @@@ additionalProperties: fals
  
  examples:
    - |
-         #include <dt-bindings/interrupt-controller/arm-gic.h>
-         #include <dt-bindings/mailbox/qcom-ipcc.h>
+     #include <dt-bindings/interrupt-controller/arm-gic.h>
+     #include <dt-bindings/mailbox/qcom-ipcc.h>
  
-         mailbox@408000 {
-                 compatible = "qcom,sm8250-ipcc", "qcom,ipcc";
-                 reg = <0x408000 0x1000>;
-                 interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
-                 interrupt-controller;
-                 #interrupt-cells = <3>;
-                 #mbox-cells = <2>;
-         };
+     mailbox@408000 {
+         compatible = "qcom,sm8250-ipcc", "qcom,ipcc";
+         reg = <0x408000 0x1000>;
+         interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
+         interrupt-controller;
+         #interrupt-cells = <3>;
+         #mbox-cells = <2>;
+     };
 +
-         smp2p-modem {
-                 compatible = "qcom,smp2p";
-                 qcom,smem = <443>, <429>;
-                 interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
-                                              IPCC_MPROC_SIGNAL_SMP2P
-                                              IRQ_TYPE_EDGE_RISING>;
-                 mboxes = <&ipcc IPCC_CLIENT_LPASS
-                                 IPCC_MPROC_SIGNAL_SMP2P>;
++    smp2p-modem {
++        compatible = "qcom,smp2p";
++        qcom,smem = <443>, <429>;
++        interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
++                                     IPCC_MPROC_SIGNAL_SMP2P
++                                     IRQ_TYPE_EDGE_RISING>;
++        mboxes = <&ipcc IPCC_CLIENT_LPASS
++                        IPCC_MPROC_SIGNAL_SMP2P>;
 +
-                 qcom,local-pid = <0>;
-                 qcom,remote-pid = <2>;
-                 /* Other SMP2P fields */
-         };
++        qcom,local-pid = <0>;
++        qcom,remote-pid = <2>;
++        /* Other SMP2P fields */
++    };

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

Re: linux-next: manual merge of the mailbox tree with the devicetree tree

[Krzysztof Kozlowski]

On 23/05/2022 06:05, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mailbox tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
> 
> between commit:
> 
>   b20eee62ee89 ("dt-bindings: mailbox: qcom-ipcc: add missing properties into example")

This commit should be rather dropped, because it duplicated my work
which entirely removed the example.

Rob,
Can you drop that commit from your tree?


Best regards,
Krzysztof

Re: linux-next: manual merge of the mailbox tree with the devicetree tree

[Rob Herring]

On Mon, May 23, 2022 at 9:33 AM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 23/05/2022 06:05, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the mailbox tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
> >
> > between commit:
> >
> >   b20eee62ee89 ("dt-bindings: mailbox: qcom-ipcc: add missing properties into example")
>
> This commit should be rather dropped, because it duplicated my work
> which entirely removed the example.
>
> Rob,
> Can you drop that commit from your tree?

No, but I've reverted it.

Rob

Re: linux-next: manual merge of the mailbox tree with the devicetree tree

[Arnaud POULIQUEN]

Hi Stephen,

On 11/28/19 1:41 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mailbox tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt
> 
> between commit:
> 
>   4360bf724483 ("dt-bindings: mailbox: convert stm32-ipcc to json-schema")
> 
> from the devicetree tree and commit:
> 
>   9b2cfd3fb09e ("dt-bindings: mailbox: stm32-ipcc: Updates for wakeup management")
> 
> from the mailbox tree.
> 
> I fixed it up (I just deleted the file - presumably there will need to be
> followup fixes to the json file) 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.
> 
No extra patch needed, the wake up property is already integrated in the json file

Thanks for your solving the merge issue!

Regards
Arnaud 

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt

between commit:

  4360bf724483 ("dt-bindings: mailbox: convert stm32-ipcc to json-schema")

from the devicetree tree and commit:

  9b2cfd3fb09e ("dt-bindings: mailbox: stm32-ipcc: Updates for wakeup management")

from the mailbox tree.

I fixed it up (I just deleted the file - presumably there will need to be
followup fixes to the json file) 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 --]