Subject: Re: linux-next: manual merge of the modules tree with the mm tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 17 May 2024 09:26:07 +1000

Hi all,

On Wed, 24 Apr 2024 12:20:34 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the modules tree got a conflict in:
> 
>   arch/powerpc/mm/mem.c
> 
> between commit:
> 
>   c22e503ced5b ("fix missing vmalloc.h includes")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   7aa7eb8269ea ("arch: make execmem setup available regardless of CONFIG_MODULES")
> 
> from the modules 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.
> 
> diff --cc arch/powerpc/mm/mem.c
> index a197d4c2244b,5de62a3c1d4b..000000000000
> --- a/arch/powerpc/mm/mem.c
> +++ b/arch/powerpc/mm/mem.c
> @@@ -16,7 -16,7 +16,8 @@@
>   #include <linux/highmem.h>
>   #include <linux/suspend.h>
>   #include <linux/dma-direct.h>
>  +#include <linux/vmalloc.h>
> + #include <linux/execmem.h>
>   
>   #include <asm/swiotlb.h>
>   #include <asm/machdep.h>

This is now a conflict between the mm-stable tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell