Hi all,
On Fri, 5 Apr 2024 11:51:11 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
Attachment:
pgpHLPi5R6jzr.pgp
Description: OpenPGP digital signature
