Re: linux-next: manual merge of the devicetree tree with the net-next tree

2021-02-22 Thread Stephen Rothwell
Hi Grygorii, On Mon, 22 Feb 2021 12:35:10 +0200 Grygorii Strashko wrote: > > Sorry for inconvenience, is there anything I can do to help resolve it? > (Changes went through a different trees) No, it is fine. -- Cheers, Stephen Rothwell pgpKLoMTrD3Vl.pgp Description: OpenPGP digital signatur

Re: linux-next: manual merge of the devicetree tree with the net-next tree

2021-02-22 Thread Grygorii Strashko
On 22/02/2021 10:23, Stephen Rothwell wrote: Hi all, On Mon, 15 Feb 2021 07:53:21 +1100 Stephen Rothwell wrote: On Thu, 21 Jan 2021 13:26:45 +1100 Stephen Rothwell wrote: Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/net/ti,k3

Re: linux-next: manual merge of the devicetree tree with the net-next tree

2021-02-22 Thread Stephen Rothwell
Hi all, On Mon, 15 Feb 2021 07:53:21 +1100 Stephen Rothwell wrote: > > On Thu, 21 Jan 2021 13:26:45 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > > Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml > > > > b

Re: linux-next: manual merge of the devicetree tree with the net-next tree

2021-02-14 Thread Stephen Rothwell
Hi all, On Thu, 21 Jan 2021 13:26:45 +1100 Stephen Rothwell 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: u

Re: linux-next: manual merge of the devicetree tree with the net-next tree

2019-07-08 Thread Stephen Rothwell
Hi all, On Fri, 28 Jun 2019 14:56:26 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/net/ethernet.txt > > between commit: > > 79b647a0c0d5 ("dt-bindings: net: document new usxgmii phy mode") > > f

Re: linux-next: manual merge of the devicetree tree with the net-next tree

2014-02-13 Thread Florian Fainelli
Hi Stephen, Le 13/02/2014 19:16, Stephen Rothwell a écrit : Hi Grant, Today's linux-next merge of the devicetree tree got a conflict in drivers/of/of_net.c between commit 8a2fe56e8827 ("net: phy: re-design phy_modes to be self-contained") from the net-next tree and commit cf4c9eb5a451 ("of: mak