Re: linux-next: manual merge of the slab tree with the rcu tree

["Vlastimil Babka (SUSE)" <vbabka@kernel.org>]

On 8/3/26 09:23, Harry Yoo wrote:
> 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.
> 
> I don't really have a strong preference  this, and it would be
> appropriate to fix this in a way Rust folks would prefer...

It should be also possible to apply Miguel's fix immediately in the
char-misc tree, and then changing it to Nathan's fix as a followup clean-up
after both trees are mainline?

>> > 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").
> 
> What do we do when it needs to be fixed in the merge commit,
> mention this in the pull request email?
>