linux-kernel - Re: linux-next: duplicate patch in the fsl 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: <20250812110343.6dd82e9f@canb.auug.org.au>
Date: Tue, 12 Aug 2025 11:03:43 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Christophe Leroy <christophe.leroy@...roup.eu>, Arnd Bergmann
 <arnd@...db.de>
Cc: ARM <linux-arm-kernel@...ts.infradead.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patch in the fsl tree

Hi Christophe,

On Wed, 23 Jul 2025 09:45:58 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> The following commit is also in the arm-soc tree as a different commit
> (but the same patch):
> 
>   8b3da0519ae6 ("soc: fsl: qe: convert set_multiple() to returning an integer")
> 
> This is commit
> 
>   12702f0c3834 ("soc: fsl: qe: convert set_multiple() to returning an integer")
> 
> in the arm-soc tree.

Since 8b3da0519ae6 is the only commit in the fsl tree and the
duplication is now causing a conflict due to another commit touching
the same file, you could just reset the fsl tree to v6.17-rc1.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped