From: "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com>
To: Rob Herring <robherring2@gmail.com>,
Krzysztof Kozlowski <krzk@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Lee Jones <lee.jones@linaro.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the devicetree tree with the mfd tree
Date: Sat, 10 Oct 2020 18:01:47 +0800 [thread overview]
Message-ID: <4ecdefed-c047-a318-a3bf-14bc4bc50b23@huawei.com> (raw)
In-Reply-To: <CAL_JsqKKaStNsDxfJw0UOzU6rTyeeJtVkaE4-nJXKHA5A1pOLg@mail.gmail.com>
On 2020/10/1 20:31, Rob Herring wrote:
> On Thu, Oct 1, 2020 at 1:26 AM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>>
>> On Thu, 1 Oct 2020 at 08:22, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> 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
>>
>> Thanks Stephen, looks good.
>>
>> Zhei,
>> However the Huawei compatibles in the original patch were added not
>> alphabetically which messes the order and increases the possibility of
>> conflicts. It would be better if the entries were kept ordered.
>
> I've fixed up the order.
Thanks.
>
> Rob
>
> .
>
next prev parent reply other threads:[~2020-10-10 11:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 6:22 linux-next: manual merge of the devicetree tree with the mfd tree Stephen Rothwell
2020-10-01 6:25 ` Krzysztof Kozlowski
2020-10-01 12:31 ` Rob Herring
2020-10-10 10:01 ` Leizhen (ThunderTown) [this message]
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=4ecdefed-c047-a318-a3bf-14bc4bc50b23@huawei.com \
--to=thunder.leizhen@huawei.com \
--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=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).