From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jassi Brar <jaswinder.singh@linaro•org>,
Rob Herring <robherring2@gmail•com>
Cc: David Heidelberg <david@ixit•cz>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rob Herring <robh@kernel•org>
Subject: linux-next: manual merge of the mailbox tree with the devicetree tree
Date: Mon, 23 May 2022 14:05:25 +1000 [thread overview]
Message-ID: <20220523140525.4ad591d0@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2022-05-23 4:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 4:05 Stephen Rothwell [this message]
2022-05-23 14:33 ` linux-next: manual merge of the mailbox tree with the devicetree tree Krzysztof Kozlowski
2022-05-23 14:39 ` Rob Herring
-- strict thread matches above, loose matches on Subject: below --
2019-11-28 0:41 Stephen Rothwell
2019-11-28 9:25 ` Arnaud POULIQUEN
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=20220523140525.4ad591d0@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=david@ixit$(echo .)cz \
--cc=jaswinder.singh@linaro$(echo .)org \
--cc=krzysztof.kozlowski@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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