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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 11 Sep 2024 09:23:42 +1000

Hi all,

On Thu, 5 Sep 2024 15:35:57 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   kernel/events/uprobes.c
> 
> between commit:
> 
>   c67907222c56 ("uprobes: use vm_special_mapping close() functionality")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   e240b0fde52f ("uprobes: Use kzalloc to allocate xol area")
> 
> from the tip 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc kernel/events/uprobes.c
> index 6eddf4352ebb,cac45ea4c284..000000000000
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@@ -1518,8 -1480,6 +1499,7 @@@ static struct xol_area *__create_xol_ar
>   		goto free_area;
>   
>   	area->xol_mapping.name = "[uprobes]";
> - 	area->xol_mapping.fault = NULL;
>  +	area->xol_mapping.close = uprobe_clear_state;
>   	area->xol_mapping.pages = area->pages;
>   	area->pages[0] = alloc_page(GFP_HIGHUSER);
>   	if (!area->pages[0])

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

-- 
Cheers,
Stephen Rothwell