linux-kernel - Re: linux-next: manual merge of the mm-stable 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: <20240714225315.f56498a2d4e924fd07633c78@linux-foundation.org>
Date: Sun, 14 Jul 2024 22:53:15 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Miaohe Lin
 <linmiaohe@...wei.com>
Subject: Re: linux-next: manual merge of the mm-stable tree with Linus' tree

On Mon, 15 Jul 2024 08:42:39 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the mm-stable tree got a conflict in:
> 
>   mm/hugetlb.c
> 
> between commit:
> 
>   5596d9e8b553 ("mm/hugetlb: fix potential race in __update_and_free_hugetlb_folio()")
> 
> from Linus' tree and commit:
> 
>   a81fa1dc5db2 ("mm/hugetlb: fix potential race with try_memory_failure_hugetlb()")
> 
> from the mm-stable 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.
> 

Thanks.  This caused me grief.  

I removed a81fa1dc5db2 ("mm/hugetlb: fix potential race with
try_memory_failure_hugetlb()") from mm-stable and redid it against
mm-unstable.  It still has cc:stable so some merging work will be
needed when the stable tree maintainers get onto it.