From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vlastimil Babka <vbabka@suse•cz>,
"Cc: Andrew Morton" <akpm@linux-foundation•org>
Cc: "Christoph Hellwig" <hch@lst•de>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Thomas Weißschuh" <thomas.weissschuh@linutronix•de>
Subject: linux-next: manual merge of the slab tree with the mm-unstable tree
Date: Fri, 14 Nov 2025 15:13:21 +1100 [thread overview]
Message-ID: <20251114151321.092927a1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
mm/mempool.c
between commit:
25c4d8d29dbb ("mempool: clarify behavior of mempool_alloc_preallocated()")
from the mm-unstable tree and commit:
5c829783e5f8 ("mempool: improve kerneldoc comments")
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.
--
Cheers,
Stephen Rothwell
diff --cc mm/mempool.c
index cceb09b75ebe,e14d1cf46c72..000000000000
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@@ -456,13 -568,12 +568,12 @@@ EXPORT_SYMBOL(mempool_alloc_noprof)
/**
* mempool_alloc_preallocated - allocate an element from preallocated elements
- * belonging to a specific memory pool
- * @pool: pointer to the memory pool which was allocated via
- * mempool_create().
+ * belonging to a memory pool
+ * @pool: pointer to the memory pool
*
- * This function is similar to mempool_alloc, but it only attempts allocating
+ * This function is similar to mempool_alloc(), but it only attempts allocating
- * an element from the preallocated elements. It does not sleep and immediately
- * returns if no preallocated elements are available.
+ * an element from the preallocated elements. It only takes a single spinlock_t
+ * and immediately returns if no preallocated elements are available.
*
* Return: pointer to the allocated element or %NULL if no elements are
* available.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-14 4:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-14 4:13 Stephen Rothwell [this message]
2025-11-14 5:06 ` linux-next: manual merge of the slab tree with the mm-unstable tree Christoph Hellwig
2025-11-14 8:46 ` Vlastimil Babka
2025-11-14 9:13 ` Thomas Weißschuh
2025-11-14 11:55 ` Christoph Hellwig
2025-11-20 13:31 ` Thomas Weißschuh
2025-11-20 17:51 ` Vlastimil Babka
-- strict thread matches above, loose matches on Subject: below --
2025-09-04 6:29 Stephen Rothwell
2025-09-04 8:39 ` Vlastimil Babka
2025-09-04 21:39 ` Andrew Morton
2025-09-04 6:20 Stephen Rothwell
2025-07-21 4:20 Stephen Rothwell
2025-07-21 19:38 ` Matthew Wilcox
2025-07-21 21:35 ` Luiz Capitulino
2025-07-22 8:30 ` Vlastimil Babka
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=20251114151321.092927a1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=thomas.weissschuh@linutronix$(echo .)de \
--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