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

[Geert Uytterhoeven]

Hi Stephen,

On Mon, 5 Jan 2026 at 03:39, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the tip tree got a conflict in:
>
>   arch/arm64/boot/dts/renesas/r9a09g077.dtsi
>
> between commit:
>
>   2d8568dddc7b ("arm64: dts: renesas: r9a09g077: Add ICU support")
>
> from the renesas tree and commit:
>
>   9b1138aef9a2 ("arm64: dts: renesas: r9a09g077: Add ICU support")
>
> from the tip tree.
>
> I fixed it up (I arbitrarily used the former version) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,

Your arbitrary choice is the correct one ;-)

In general, please never take DTS patches through a non-soc tree unless
an Acked-by is provided.  In this particular case, the commit in the
tip tree is not only incorrect, but is also a dependency for later
commits, so it has to go through the renesas tree.

The same applies to the corresponding r9a09g087 commits.

Thank you!

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds