Re: linux-next: manual merge of the davinci tree with the arm-soc tree

[Bartosz Golaszewski]

On Mon, 9 Jan 2023 at 23:42, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the davinci tree got a conflict in:
>
>   arch/arm/mach-davinci/board-dm365-evm.c
>
> between commit:
>
>   fef6ca600ba7 ("ARM: davinci: remove unused board support")
>
> from the arm-soc tree and commit:
>
>   84bde55c050b ("ARM: davinci: fix repeated words in comments")
>
> from the davinci tree.
>
> I fixed it up (I removed the file) 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

I backed out this patch, thanks!

Bart