From: Grygorii Strashko <grygorii.strashko@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Rob Herring <robherring2@gmail.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Jakub Kicinski <kuba@kernel.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: Re: linux-next: manual merge of the devicetree tree with the net-next tree
Date: Mon, 22 Feb 2021 12:35:10 +0200 [thread overview]
Message-ID: <bbddedcf-fa9b-95bd-1e10-5a46da88f305@ti.com> (raw)
In-Reply-To: <20210222192306.400c6a50@canb.auug.org.au>
On 22/02/2021 10:23, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 15 Feb 2021 07:53:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Thu, 21 Jan 2021 13:26:45 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>
>>> Today's linux-next merge of the devicetree tree got a conflict in:
>>>
>>> Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
>>>
>>> between commit:
>>>
>>> 19d9a846d9fc ("dt-binding: net: ti: k3-am654-cpsw-nuss: update bindings for am64x cpsw3g")
>>>
>>> from the net-next tree and commit:
>>>
>>> 0499220d6dad ("dt-bindings: Add missing array size constraints")
>>>
>>> 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.
>>>
>>> diff --cc Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
>>> index 3fae9a5f0c6a,097c5cc6c853..000000000000
>>> --- a/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
>>> +++ b/Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml
>>> @@@ -72,7 -66,8 +72,8 @@@ properties
>>> dma-coherent: true
>>>
>>> clocks:
>>> + maxItems: 1
>>> - description: CPSW2G NUSS functional clock
>>> + description: CPSWxG NUSS functional clock
>>>
>>> clock-names:
>>> items:
>>
>> With the merge window about to open, this is a reminder that this
>> conflict still exists.
>
> This is now a conflict between the devicetree tree and Linus' tree.
>
Sorry for inconvenience, is there anything I can do to help resolve it?
(Changes went through a different trees)
--
Best regards,
grygorii
next prev parent reply other threads:[~2021-02-22 10:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 2:26 linux-next: manual merge of the devicetree tree with the net-next tree Stephen Rothwell
2021-02-14 20:53 ` Stephen Rothwell
2021-02-22 8:23 ` Stephen Rothwell
2021-02-22 10:35 ` Grygorii Strashko [this message]
2021-02-22 21:12 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-08-29 1:50 Stephen Rothwell
2020-05-15 5:28 Stephen Rothwell
2019-06-28 4:56 Stephen Rothwell
2019-07-09 0:15 ` Stephen Rothwell
2018-07-30 4:37 Stephen Rothwell
2018-08-15 3:14 ` Stephen Rothwell
2017-06-23 3:37 Stephen Rothwell
2014-02-14 3:16 Stephen Rothwell
2014-02-14 3:47 ` Florian Fainelli
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=bbddedcf-fa9b-95bd-1e10-5a46da88f305@ti.com \
--to=grygorii.strashko@ti.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=robh@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).