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

[Andrew Morton]

On Mon, 31 Mar 2025 10:19:34 -0400 Luiz Capitulino <luizcap@xxxxxxxxxx> wrote:

> >>   -	page_ext_put(page_ext);
> >>    
> >>    	if (alloc_handle != early_handle)
> >>    		/*
> > 
> > This is now a conflict between the mm-stable tree and Linus' tree.
> 
> What's the best way to resolve this? Should I post again or can we just use your fix?

It's in Linus's hands now...