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

[Mike Rapoport <rppt@kernel.org>]

On Mon, Jul 27, 2026 at 12:38:58PM +0100, Mark Brown wrote:
> On Mon, Jul 27, 2026 at 08:48:31AM +0300, Mike Rapoport wrote:
> > On Sun, Jul 26, 2026 at 10:33:53PM +0100, Mark Brown wrote:
> 
> > > from the mm-hotfixes-unstable tree and commit:
> 
> > >   5fce67641a3ed ("x86/mm/pat: Don't gate cpa_lock on debug_pagealloc_enabled()")
> 
> > > from the tip tree.
> 
> > > - 	if (!debug_pagealloc_enabled())
> > > - 		spin_unlock(&cpa_lock);
> > > + 	spin_unlock(&cpa_lock);
> > 
> > This should be
> 
> >  	if (!debug_pagealloc_enabled())
> >  		spin_unlock(&cpa_lock);
> 
> So essentially dropping the changes from the above commit from the tip
> tree? 

It's a bit more messy, but essentially yes :)

> Should that commit be there?

There is another commit Lorenzo mentioned that depends on that.

And the patches I have mentioned in reply to Lorenzo should take care of
it.

-- 
Sincerely yours,
Mike.