linux-kernel - Re: linux-next: manual merge of the arm64 tree with Linus' 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: <20250521084057.GA20110@willie-the-truck>
Date: Wed, 21 May 2025 09:40:57 +0100
From: Will Deacon <will@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Catalin Marinas <catalin.marinas@....com>,
	Ard Biesheuvel <ardb@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Marc Zyngier <maz@...nel.org>,
	Oliver Upton <oliver.upton@...ux.dev>
Subject: Re: linux-next: manual merge of the arm64 tree with Linus' tree

On Wed, May 21, 2025 at 11:34:26AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm64 tree got a conflict in:
> 
>   arch/arm64/kernel/image-vars.h
> 
> between commit:
> 
>   117c3b21d3c7 ("arm64: Rework checks for broken Cavium HW in the PI code")
> 
> from Linus' tree and commit:
> 
>   90530521079e ("arm64/boot: Disallow BSS exports to startup code")
> 
> from the arm64 tree.

Thanks, Stephen. That looks correct to me. We're basically just
dropping the Cavium block here:

>  -#ifdef CONFIG_CAVIUM_ERRATUM_27456
>  -PI_EXPORT_SYM(cavium_erratum_27456_cpus);
>  -PI_EXPORT_SYM(is_midr_in_range_list);
>  -#endif

Will