linux-kernel - linux-next: manual merge of the arm64 tree with the origin 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-next>] [day] [month] [year] [list]

Message-ID: <aNJZaJT9elF0TDqH@finisterre.sirena.org.uk>
Date: Tue, 23 Sep 2025 10:25:12 +0200
From: Mark Brown <broonie@...nel.org>
To: Catalin Marinas <catalin.marinas@....com>,
	Will Deacon <will@...nel.org>
Cc: Dev Jain <dev.jain@....com>, Kees Cook <kees@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the arm64 tree with the origin tree

Hi all,

Today's linux-next merge of the arm64 tree got a conflict in:

  arch/arm64/mm/mmu.c

between commit:

  ceca927c86e6f ("arm64: mm: Fix CFI failure due to kpti_ng_pgd_alloc function signature")

from the origin tree and commit:

  fa93b45fd397e ("arm64: Enable vmalloc-huge with ptdump")

from the arm64 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.

diff --cc arch/arm64/mm/mmu.c
index 980d7745a5499,10c2580995814..0000000000000
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@@ -47,6 -49,15 +49,8 @@@
  #define NO_CONT_MAPPINGS	BIT(1)
  #define NO_EXEC_MAPPINGS	BIT(2)	/* assumes FEAT_HPDS is not used */
  
 -enum pgtable_type {
 -	TABLE_PTE,
 -	TABLE_PMD,
 -	TABLE_PUD,
 -	TABLE_P4D,
 -};
 -
+ DEFINE_STATIC_KEY_FALSE(arm64_ptdump_lock_key);
+ 
  u64 kimage_voffset __ro_after_init;
  EXPORT_SYMBOL(kimage_voffset);
  

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)