linux-kernel - Re: linux-next: manual merge of the tip tree with the amlogic 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 for Android: free password hash cracker in your pocket

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

Message-ID: <dc507069-6116-472a-a543-7951b8a177a4@linaro.org>
Date: Thu, 20 Nov 2025 08:46:12 +0100
From: Neil Armstrong <neil.armstrong@...aro.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Kevin Hilman <khilman@...libre.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>,
 Xianwei Zhao <xianwei.zhao@...ogic.com>
Subject: Re: linux-next: manual merge of the tip tree with the amlogic tree

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.
>