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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAMuHMdUVcLLs6BzmVTaikqVqtevuT9N2F1W6iBpD=1WTpWNXdw@mail.gmail.com>
Date: Mon, 5 Jan 2026 11:04:39 +0100
From: Geert Uytterhoeven <geert@...ux-m68k.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>, 
	"H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, 
	Cosmin Tanislav <cosmin-gabriel.tanislav.xa@...esas.com>, 
	Geert Uytterhoeven <geert+renesas@...der.be>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the renesas tree

Hi Stephen,

On Mon, 5 Jan 2026 at 03:39, Stephen Rothwell <sfr@...b.auug.org.au> 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@...ux-m68k.org

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