From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>, Lee Jones <lee.jones@linaro.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Zhen Lei <thunder.leizhen@huawei.com>
Subject: linux-next: manual merge of the devicetree tree with the mfd tree
Date: Thu, 1 Oct 2020 16:22:37 +1000 [thread overview]
Message-ID: <20201001162237.633d6043@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]
Hi all,
Today's linux-next merge of the devicetree tree got a conflict in:
Documentation/devicetree/bindings/mfd/syscon.yaml
between commit:
18394297562a ("dt-bindings: mfd: syscon: Merge Samsung Exynos Sysreg bindings")
05027df1b94f ("dt-bindings: mfd: syscon: Document Exynos3 and Exynos5433 compatibles")
from the mfd tree and commit:
35b096dd6353 ("dt-bindings: mfd: syscon: add some compatible strings for Hisilicon")
from the devicetree 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/mfd/syscon.yaml
index 0f21943dea28,fc2e85004d36..000000000000
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@@ -40,11 -40,10 +40,14 @@@ properties
- allwinner,sun50i-a64-system-controller
- microchip,sparx5-cpu-syscon
- mstar,msc313-pmsleep
+ - samsung,exynos3-sysreg
+ - samsung,exynos4-sysreg
+ - samsung,exynos5-sysreg
+ - samsung,exynos5433-sysreg
-
+ - hisilicon,hi6220-sramctrl
+ - hisilicon,pcie-sas-subctrl
+ - hisilicon,peri-subctrl
+ - hisilicon,dsa-subctrl
- const: syscon
- contains:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-10-01 6:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 6:22 Stephen Rothwell [this message]
2020-10-01 6:25 ` linux-next: manual merge of the devicetree tree with the mfd tree Krzysztof Kozlowski
2020-10-01 12:31 ` Rob Herring
2020-10-10 10:01 ` Leizhen (ThunderTown)
2020-10-06 6:03 Stephen Rothwell
2022-03-22 3:10 Stephen Rothwell
2022-03-22 7:18 ` Lee Jones
2022-03-22 12:43 ` Rob Herring
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=20201001162237.633d6043@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=krzk@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robherring2@gmail.com \
--cc=thunder.leizhen@huawei.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.