Re: linux-next: manual merge of the at91 tree with Linus' tree

[Nicolas Ferre]

On 21/10/2021 at 23:56, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the at91 tree got a conflict in:
>
>    arch/arm/boot/dts/sama7g5.dtsi
>
> between commit:
>
>    6f3466228451 ("ARM: dts: at91: sama7g5: add chipid")
>
> from Linus' tree and commit:
>
>    9430ff34385e ("ARM: dts: at91: sama7g5: add tcb nodes")
>
> from the at91 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.

Stephen,

Yes, carry this fix please.
It's handled in arm-soc tree by Arnd and Olof: should not be a problem 
upstream.

Thanks, best regards,
  Nicolas

--
Nicolas Ferre