linux-kernel - linux-next: manual merge of the slab tree with the mm-unstable tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20251114151321.092927a1@canb.auug.org.au>
Date: Fri, 14 Nov 2025 15:13:21 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Vlastimil Babka <vbabka@...e.cz>, "Cc: Andrew Morton"
 <akpm@...ux-foundation.org>
Cc: Christoph Hellwig <hch@....de>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Thomas Weißschuh
 <thomas.weissschuh@...utronix.de>
Subject: linux-next: manual merge of the slab tree with the mm-unstable tree

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.

Content of type "application/pgp-signature" skipped