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

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 pgpF0k0K_zLOS.pgp Description: OpenPGP digital signatur

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

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

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

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