linux-kernel - Re: linux-next: manual merge of the tip tree with the mm 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]

Date: Mon, 8 Apr 2024 09:50:51 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Arnd Bergmann <arnd@...db.de>, Ingo Molnar <mingo@...nel.org>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Suren Baghdasaryan <surenb@...gle.com>
Subject: Re: linux-next: manual merge of the tip tree with the mm tree

Hi all,

On Fri, 5 Apr 2024 11:51:11 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   arch/x86/mm/numa_32.c
> 
> between commit:
> 
>   d82a37ff6b88 ("fixup! fix missing vmalloc.h includes")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   9852b1dc6a14 ("x86/numa/32: Include missing <asm/pgtable_areas.h>")
> 
> from the tip tree.
> 
> diff --cc arch/x86/mm/numa_32.c
> index e25e08ba4531,025fd7ea5d69..000000000000
> --- a/arch/x86/mm/numa_32.c
> +++ b/arch/x86/mm/numa_32.c
> @@@ -24,7 -24,7 +24,8 @@@
>   
>   #include <linux/memblock.h>
>   #include <linux/init.h>
>  +#include <linux/vmalloc.h>
> + #include <asm/pgtable_areas.h>
>   
>   #include "numa_internal.h"
>   

This is now a conflict between commit

   9852b1dc6a14 ("x86/numa/32: Include missing <asm/pgtable_areas.h>")

in Linus' tree and commit

  a800a5095942 ("fixup! fix missing vmalloc.h includes")

from the mm-unstable branch of the mm tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped