Re: linux-next: manual merge of the tip tree with the amlogic tree

[Neil Armstrong]

Hi,

On 11/20/25 05:04, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
>    arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi
>
> between commit:
>
>    fe85b8876768 ("arm64: dts: amlogic: s6: add ao secure node")
>
> from the amlogic tree and commit:
>
>    4b6111d677c7 ("arm64: dts: amlogic: Add gpio_intc node for Amlogic S6 SoCs")

Thanks, I wasn't aware those DT patches were merged via another tree.

I'll remove my patches for now.

Neil

> from the tip 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.