From: Mark Brown <broonie@kernel•org>
To: Vlastimil Babka <vbabka@suse•cz>
Cc: Hao Ge <hao.ge@linux•dev>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the slab tree with the slab-fixes tree
Date: Thu, 5 Feb 2026 13:55:04 +0000 [thread overview]
Message-ID: <aYShOPWbajIlXx_i@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
mm/slub.c
between commit:
3a38d13f90d4e ("mm/slab: Add alloc_tagging_slab_free_hook for memcg_alloc_abort_single")
from the slab-fixes tree and commit:
bdc9282f78096 ("slab: remove the do_slab_free() fastpath")
from the slab tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc mm/slub.c
index f9d1f6b69305c,102fb47ae0133..0000000000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -6689,12 -6094,8 +6094,12 @@@ void slab_free(struct kmem_cache *s, st
static noinline
void memcg_alloc_abort_single(struct kmem_cache *s, void *object)
{
+ struct slab *slab = virt_to_slab(object);
+
+ alloc_tagging_slab_free_hook(s, slab, &object, 1);
+
if (likely(slab_free_hook(s, object, slab_want_init_on_free(s), false)))
- do_slab_free(s, slab, object, object, 1, _RET_IP_);
- __slab_free(s, virt_to_slab(object), object, object, 1, _RET_IP_);
++ __slab_free(s, slab, object, object, 1, _RET_IP_);
}
#endif
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-02-05 13:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-05 13:55 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-21 16:11 linux-next: manual merge of the slab tree with the slab-fixes tree Mark Brown
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=aYShOPWbajIlXx_i@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=hao.ge@linux$(echo .)dev \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vbabka@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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