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

Message-ID: <20251114112144.366698c7@canb.auug.org.au>
Date: Fri, 14 Nov 2025 11:21:44 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Catalin Marinas <catalin.marinas@....com>, Will Deacon
 <will@...nel.org>, "Cc: Andrew Morton" <akpm@...ux-foundation.org>
Cc: Anshuman Khandual <anshuman.khandual@....com>, Chaitanya S Prakash
 <chaitanyas.prakash@....com>, Linu Cherian <linu.cherian@....com>, 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 mm-unstable
 tree

Hi all,

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

  arch/arm64/mm/mmu.c

between commit:

  2b9cdb805fcd ("mm: make INVALID_PHYS_ADDR a generic macro")

from the mm-unstable tree and commit:

  bfc184cb1ba7 ("arm64/mm: Allow __create_pgd_mapping() to propagate pgtable_alloc() errors")

from the arm64 tree.

I fixed it up (the latter moved the INVALID_PHYS_ADDR define so I removed
it from its new place, and there was no conflict left) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped