From: Mike Rapoport <rppt@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Stoakes <ljs@kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the mm-hotfixes-unstable tree
Date: Mon, 27 Jul 2026 16:09:22 +0300 [thread overview]
Message-ID: <amdYgmAmU4bVDd1X@kernel.org> (raw)
In-Reply-To: <76ef8225-1d4a-49e4-a3b9-5e341ec6a057@sirena.org.uk>
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.
next prev parent reply other threads:[~2026-07-27 13:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-26 21:33 linux-next: manual merge of the tip tree with the mm-hotfixes-unstable tree Mark Brown
2026-07-27 5:48 ` Mike Rapoport
2026-07-27 11:33 ` Lorenzo Stoakes (ARM)
2026-07-27 13:03 ` Mike Rapoport
2026-07-27 18:15 ` Lorenzo Stoakes (ARM)
2026-07-27 11:38 ` Mark Brown
2026-07-27 13:09 ` Mike Rapoport [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-07-21 13:46 Mark Brown
2026-07-21 16:14 ` Lorenzo Stoakes (ARM)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=amdYgmAmU4bVDd1X@kernel.org \
--to=rppt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ljs@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox