From: Mark Brown <broonie@kernel•org>
To: Vlastimil Babka <vbabka@suse•cz>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Swaraj Gaikwad <swarajgaikwad1925@gmail•com>
Subject: linux-next: manual merge of the slab tree with the slab-fixes tree
Date: Wed, 21 Jan 2026 16:11:17 +0000 [thread overview]
Message-ID: <aXD6peMfe2HrLKOd@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
mm/slub.c
between commit:
99a3e3a1cfc93 ("slab: fix kmalloc_nolock() context check for PREEMPT_RT")
from the slab-fixes tree and commit:
da6ed0180825d ("slab: simplify kmalloc_nolock()")
a4ae75d1b6a24 ("slab: fix kmalloc_nolock() context check for PREEMPT_RT")
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 c58e664bb312a,331d274ba0a8c..0000000000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -5694,13 -5166,13 +5166,13 @@@ void *kmalloc_nolock_noprof(size_t size
if (unlikely(!size))
return ZERO_SIZE_PTR;
+ /*
+ * See the comment for the same check in
+ * alloc_frozen_pages_nolock_noprof()
+ */
- if (IS_ENABLED(CONFIG_PREEMPT_RT) && (in_nmi() || in_hardirq()))
+ if (IS_ENABLED(CONFIG_PREEMPT_RT) && !preemptible())
- /*
- * kmalloc_nolock() in PREEMPT_RT is not supported from
- * non-preemptible context because local_lock becomes a
- * sleeping lock on RT.
- */
return NULL;
retry:
if (unlikely(size > KMALLOC_MAX_CACHE_SIZE))
return NULL;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-01-21 16:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-21 16:11 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-02-05 13:55 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=aXD6peMfe2HrLKOd@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=swarajgaikwad1925@gmail$(echo .)com \
--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