linux-kernel - Re: 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <8734697ae4.fsf@DESKTOP-5N7EMDA>
Date: Thu, 20 Nov 2025 09:36:35 +0800
From: "Huang, Ying" <ying.huang@...ux.alibaba.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Catalin Marinas <catalin.marinas@....com>,  Will Deacon
 <will@...nel.org>,  Andrew Morton <akpm@...ux-foundation.org>,  Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>,  Linux Next Mailing
 List <linux-next@...r.kernel.org>,  Lorenzo Stoakes
 <lorenzo.stoakes@...cle.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the mm-unstable
 tree

Hi, Stephen,

Stephen Rothwell <sfr@...b.auug.org.au> writes:

> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
>   mm/memory.c
>
> between commit:
>
>   b08b123ead1a ("mm: avoid unnecessary use of is_swap_pmd()")
>
> from the mm-unstable tree and commit:
>
>   79301c7d605a ("mm: add spurious fault fixing support for huge pmd")
>
> from the arm64 tree.
>
> I fixed it up (I think - 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.

The fix looks right to me.  Thanks!

---
Best Regards,
Huang, Ying