From: Alice Ryhl <aliceryhl@google.com>
To: Nathan Chancellor <nathan@kernel.org>
Cc: Boqun Feng <boqun@kernel.org>, Miguel Ojeda <ojeda@kernel.org>,
broonie@kernel.org, harry@kernel.org,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org,
paulmck@kernel.org, puranjay@kernel.org, vbabka@kernel.org,
vbabka@suse.cz, Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bert Karwatzki <spasswolf@web.de>
Subject: Re: linux-next: manual merge of the slab tree with the rcu tree
Date: Tue, 4 Aug 2026 08:26:10 +0000 [thread overview]
Message-ID: <anGiIkvkDfYogBlu@google.com> (raw)
In-Reply-To: <20260731220137.GA3307698@ax162>
On Fri, Jul 31, 2026 at 03:01:37PM -0700, Nathan Chancellor wrote:
> On Fri, Jul 31, 2026 at 11:14:42PM +0200, Alice Ryhl wrote:
> > I like Nathan's fix as well.
> >
> > Not sure if it needs to be done in the merge commit, or if we can
> > apply it as a patch to char-misc despite the unknown CFG_*?
>
> It would need to be applied at the merge of the two trees because
> CONFIG_KVFREE_RCU_BATCHED was introduced back in 6.15 in commit
> c9f8f1242a4c ("slab: don't batch kvfree_rcu() with SLUB_TINY").
Is that required? Yes, the cfg(CONFIG_KVFREE_RCU_BATCHED) will fail in
Greg's tree because the CFG doesn't exist and is hence not enabled ...
but the cfg not applying is what we want.
The main risk I can think of is a warning about an unknown CFG being
used. Perhaps we could silence the warning?
Or I mean, we can also just fix it in the merge commit if that works for
everyone.
Alice
next prev parent reply other threads:[~2026-08-04 8:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-30 14:38 linux-next: manual merge of the slab tree with the rcu tree Mark Brown
2026-07-30 17:31 ` Paul E. McKenney
2026-08-01 12:41 ` Harry Yoo
2026-07-31 7:56 ` Miguel Ojeda
2026-07-31 9:59 ` Vlastimil Babka (SUSE)
2026-07-31 12:54 ` Vlastimil Babka (SUSE)
2026-07-31 20:07 ` Boqun Feng
2026-07-31 20:51 ` Miguel Ojeda
2026-07-31 21:14 ` Alice Ryhl
2026-07-31 22:01 ` Nathan Chancellor
2026-08-03 7:23 ` Harry Yoo
2026-08-03 8:07 ` Miguel Ojeda
2026-08-03 11:17 ` Harry Yoo
2026-08-03 12:21 ` Miguel Ojeda
2026-08-03 13:33 ` Vlastimil Babka (SUSE)
2026-08-04 8:26 ` Alice Ryhl [this message]
2026-08-04 8:44 ` Vlastimil Babka (SUSE)
2026-08-04 10:01 ` Miguel Ojeda
2026-08-04 10:39 ` Vlastimil Babka (SUSE)
-- strict thread matches above, loose matches on Subject: below --
2025-02-12 4:09 Stephen Rothwell
2025-02-12 5:34 ` Boqun Feng
2024-08-12 2:47 Stephen Rothwell
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=anGiIkvkDfYogBlu@google.com \
--to=aliceryhl@google.com \
--cc=boqun@kernel.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=harry@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=ojeda@kernel.org \
--cc=paulmck@kernel.org \
--cc=puranjay@kernel.org \
--cc=spasswolf@web.de \
--cc=vbabka@kernel.org \
--cc=vbabka@suse.cz \
/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