Skip to content

Commit cfb2e2c

Browse files
torvaldstorvalds
committed
Merge tag 'mm-hotfixes-stable-2025-04-16-19-59' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull misc hotfixes from Andrew Morton: "31 hotfixes. 9 are cc:stable and the remainder address post-6.15 issues or aren't considered necessary for -stable kernels. 22 patches are for MM, 9 are otherwise" * tag 'mm-hotfixes-stable-2025-04-16-19-59' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (31 commits) MAINTAINERS: update HUGETLB reviewers mm: fix apply_to_existing_page_range() selftests/mm: fix compiler -Wmaybe-uninitialized warning alloc_tag: handle incomplete bulk allocations in vm_module_tags_populate mailmap: add entry for Jean-Michel Hautbois mm: (un)track_pfn_copy() fix + doc improvements mm: fix filemap_get_folios_contig returning batches of identical folios mm/hugetlb: add a line break at the end of the format string selftests: mincore: fix tmpfs mincore test failure mm/hugetlb: fix set_max_huge_pages() when there are surplus pages mm/cma: report base address of single range correctly mm: page_alloc: speed up fallbacks in rmqueue_bulk() kunit: slub: add module description mm/kasan: add module decription ucs2_string: add module description zlib: add module description fpga: tests: add module descriptions samples/livepatch: add module descriptions ASN.1: add module description mm/vma: add give_up_on_oom option on modify/merge, use in uffd release ...
2 parents c133686 + a727a83 commit cfb2e2c

38 files changed

+357
-282
lines changed

‎.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
322322
Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
323323
Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
324324
<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
325+
Jean-Michel Hautbois <jeanmichel.hautbois@yoseli.org> <jeanmichel.hautbois@ideasonboard.com>
325326
Jean Tourrilhes <jt@hpl.hp.com>
326327
Jeevan Shriram <quic_jshriram@quicinc.com> <jshriram@codeaurora.org>
327328
Jeff Garzik <jgarzik@pretzel.yyz.us>
@@ -438,6 +439,8 @@ Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
438439
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
439440
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
440441
Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
442+
Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@linaro.org>
443+
Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@intel.com>
441444
Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
442445
Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>
443446
Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>

‎Documentation/userspace-api/mseal.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SYSCALL
2727
=======
2828
mseal syscall signature
2929
-----------------------
30-
``int mseal(void \* addr, size_t len, unsigned long flags)``
30+
``int mseal(void *addr, size_t len, unsigned long flags)``
3131

3232
**addr**/**len**: virtual memory address range.
3333
The address range set by **addr**/**len** must meet:

‎MAINTAINERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10956,6 +10956,7 @@ F: include/linux/platform_data/huawei-gaokun-ec.h
1095610956

1095710957
HUGETLB SUBSYSTEM
1095810958
M: Muchun Song <muchun.song@linux.dev>
10959+
R: Oscar Salvador <osalvador@suse.de>
1095910960
L: linux-mm@kvack.org
1096010961
S: Maintained
1096110962
F: Documentation/ABI/testing/sysfs-kernel-mm-hugepages
@@ -12812,6 +12813,7 @@ F: lib/Kconfig.kcsan
1281212813
F: scripts/Makefile.kcsan
1281312814

1281412815
KDUMP
12816+
M: Andrew Morton <akpm@linux-foundation.org>
1281512817
M: Baoquan He <bhe@redhat.com>
1281612818
R: Vivek Goyal <vgoyal@redhat.com>
1281712819
R: Dave Young <dyoung@redhat.com>
@@ -13113,6 +13115,8 @@ F: fs/kernfs/
1311313115
F: include/linux/kernfs.h
1311413116

1311513117
KEXEC
13118+
M: Andrew Morton <akpm@linux-foundation.org>
13119+
M: Baoquan He <bhe@redhat.com>
1311613120
L: kexec@lists.infradead.org
1311713121
W: http://kernel.org/pub/linux/utils/kernel/kexec/
1311813122
F: include/linux/kexec.h

‎drivers/fpga/tests/fpga-bridge-test.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,4 +170,5 @@ static struct kunit_suite fpga_bridge_suite = {
170170

171171
kunit_test_suite(fpga_bridge_suite);
172172

173+
MODULE_DESCRIPTION("KUnit test for the FPGA Bridge");
173174
MODULE_LICENSE("GPL");

‎drivers/fpga/tests/fpga-mgr-test.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,4 +330,5 @@ static struct kunit_suite fpga_mgr_suite = {
330330

331331
kunit_test_suite(fpga_mgr_suite);
332332

333+
MODULE_DESCRIPTION("KUnit test for the FPGA Manager");
333334
MODULE_LICENSE("GPL");

‎drivers/fpga/tests/fpga-region-test.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,5 @@ static struct kunit_suite fpga_region_suite = {
214214

215215
kunit_test_suite(fpga_region_suite);
216216

217+
MODULE_DESCRIPTION("KUnit test for the FPGA Region");
217218
MODULE_LICENSE("GPL");

‎include/linux/local_lock.h

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -52,74 +52,32 @@
5252
__local_unlock_irqrestore(lock, flags)
5353

5454
/**
55-
* localtry_lock_init - Runtime initialize a lock instance
56-
*/
57-
#define localtry_lock_init(lock) __localtry_lock_init(lock)
58-
59-
/**
60-
* localtry_lock - Acquire a per CPU local lock
61-
* @lock: The lock variable
62-
*/
63-
#define localtry_lock(lock) __localtry_lock(lock)
64-
65-
/**
66-
* localtry_lock_irq - Acquire a per CPU local lock and disable interrupts
67-
* @lock: The lock variable
68-
*/
69-
#define localtry_lock_irq(lock) __localtry_lock_irq(lock)
70-
71-
/**
72-
* localtry_lock_irqsave - Acquire a per CPU local lock, save and disable
73-
* interrupts
74-
* @lock: The lock variable
75-
* @flags: Storage for interrupt flags
55+
* local_lock_init - Runtime initialize a lock instance
7656
*/
77-
#define localtry_lock_irqsave(lock, flags) \
78-
__localtry_lock_irqsave(lock, flags)
57+
#define local_trylock_init(lock) __local_trylock_init(lock)
7958

8059
/**
81-
* localtry_trylock - Try to acquire a per CPU local lock.
60+
* local_trylock - Try to acquire a per CPU local lock
8261
* @lock: The lock variable
8362
*
8463
* The function can be used in any context such as NMI or HARDIRQ. Due to
8564
* locking constrains it will _always_ fail to acquire the lock in NMI or
8665
* HARDIRQ context on PREEMPT_RT.
8766
*/
88-
#define localtry_trylock(lock) __localtry_trylock(lock)
67+
#define local_trylock(lock) __local_trylock(lock)
8968

9069
/**
91-
* localtry_trylock_irqsave - Try to acquire a per CPU local lock, save and disable
92-
* interrupts if acquired
70+
* local_trylock_irqsave - Try to acquire a per CPU local lock, save and disable
71+
* interrupts if acquired
9372
* @lock: The lock variable
9473
* @flags: Storage for interrupt flags
9574
*
9675
* The function can be used in any context such as NMI or HARDIRQ. Due to
9776
* locking constrains it will _always_ fail to acquire the lock in NMI or
9877
* HARDIRQ context on PREEMPT_RT.
9978
*/
100-
#define localtry_trylock_irqsave(lock, flags) \
101-
__localtry_trylock_irqsave(lock, flags)
102-
103-
/**
104-
* local_unlock - Release a per CPU local lock
105-
* @lock: The lock variable
106-
*/
107-
#define localtry_unlock(lock) __localtry_unlock(lock)
108-
109-
/**
110-
* local_unlock_irq - Release a per CPU local lock and enable interrupts
111-
* @lock: The lock variable
112-
*/
113-
#define localtry_unlock_irq(lock) __localtry_unlock_irq(lock)
114-
115-
/**
116-
* localtry_unlock_irqrestore - Release a per CPU local lock and restore
117-
* interrupt flags
118-
* @lock: The lock variable
119-
* @flags: Interrupt flags to restore
120-
*/
121-
#define localtry_unlock_irqrestore(lock, flags) \
122-
__localtry_unlock_irqrestore(lock, flags)
79+
#define local_trylock_irqsave(lock, flags) \
80+
__local_trylock_irqsave(lock, flags)
12381

12482
DEFINE_GUARD(local_lock, local_lock_t __percpu*,
12583
local_lock(_T),

0 commit comments

Comments
 (0)