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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Mar 2025 10:37:52 +1100

Hi all,

On Tue, 11 Mar 2025 20:21:26 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the sysctl tree got a conflict in:
> 
>   include/linux/mm.h
> 
> between commit:
> 
>   61316cdc1915 ("arch, mm: introduce arch_mm_preinit")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   73aa354af21d ("mm: filemap: move sysctl to mm/filemap.c")
> 
> from the sysctl 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 include/linux/mm.h
> index 4d32053c3d19,f5ba3ed8b44a..000000000000
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@@ -41,9 -40,6 +41,7 @@@ struct user_struct
>   struct pt_regs;
>   struct folio_batch;
>   
> - extern int sysctl_page_lock_unfairness;
> - 
>  +void arch_mm_preinit(void);
>   void mm_core_init(void);
>   void init_mm_internals(void);
>   

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

-- 
Cheers,
Stephen Rothwell