From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Linus Walleij <linus.walleij@linaro.org>,
Rob Herring <robherring2@gmail.com>
Cc: Bhupesh Sharma <bhupesh.sharma@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Luca Weiss <luca.weiss@fairphone.com>,
Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the pinctrl tree with the devicetree tree
Date: Wed, 20 Apr 2022 14:46:56 +1000 [thread overview]
Message-ID: <20220420144656.251e6261@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
Hi all,
Today's linux-next merge of the pinctrl tree got a conflict in:
Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
between commit:
998282c6dad8 ("dt-bindings: qcom,pdc: Add SM6350 compatible")
from the devicetree tree and commit:
6d289c378af4 ("dt-bindings: qcom,pdc: Add compatible for SM8150")
from the pinctrl tree.
I fixed it up (see below - I "corrected" the SM8150 in line with the former
commit) 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/interrupt-controller/qcom,pdc.txt
index 3b7b1134dea9,bd3539644d3f..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.txt
@@@ -21,9 -21,9 +21,10 @@@ Properties
- "qcom,sc7180-pdc": For SC7180
- "qcom,sc7280-pdc": For SC7280
- "qcom,sdm845-pdc": For SDM845
- - "qcom,sdm8150-pdc": For SM8150
- - "qcom,sdm8250-pdc": For SM8250
- - "qcom,sdm8350-pdc": For SM8350
+ - "qcom,sm6350-pdc": For SM6350
++ - "qcom,sm8150-pdc": For SM8150
+ - "qcom,sm8250-pdc": For SM8250
+ - "qcom,sm8350-pdc": For SM8350
- reg:
Usage: required
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-04-20 4:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 4:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-07-31 5:42 linux-next: manual merge of the pinctrl tree with the devicetree tree Stephen Rothwell
2018-07-31 7:32 ` Ludovic BARRE
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=20220420144656.251e6261@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhupesh.sharma@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=luca.weiss@fairphone.com \
--cc=robh@kernel.org \
--cc=robherring2@gmail.com \
/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