Commit 5635d8ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-01-04-18-02' of... 

Merge tag 'mm-hotfixes-stable-2025-01-04-18-02' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull hotfixes from Andrew Morton:
 "25 hotfixes.  16 are cc:stable.  18 are MM and 7 are non-MM.

  The usual bunch of singletons and two doubletons - please see the
  relevant changelogs for details"

* tag 'mm-hotfixes-stable-2025-01-04-18-02' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (25 commits)
  MAINTAINERS: change Arınç _NAL's name and email address
  scripts/sorttable: fix orc_sort_cmp() to maintain symmetry and transitivity
  mm/util: make memdup_user_nul() similar to memdup_user()
  mm, madvise: fix potential workingset node list_lru leaks
  mm/damon/core: fix ignored quota goals and filters of newly committed schemes
  mm/damon/core: fix new damon_target objects leaks on damon_commit_targets()
  mm/list_lru: fix false warning of negative counter
  vmstat: disable vmstat_work on vmstat_cpu_down_prep()
  mm: shmem: fix the update of 'shmem_falloc->nr_unswapped'
  mm: shmem: fix incorrect index alignment for within_size policy
  percpu: remove intermediate variable in PERCPU_PTR()
  mm: zswap: fix race between [de]compression and CPU hotunplug
  ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv
  fs/proc/task_mmu: fix pagemap flags with PMD THP entries on 32bit
  kcov: mark in_softirq_really() as __always_inline
  docs: mm: fix the incorrect 'FileHugeMapped' field
  mailmap: modify the entry for Mathieu Othacehe
  mm/kmemleak: fix sleeping function called from invalid context at print message
  mm: hugetlb: independent PMD page table shared count
  maple_tree: reload mas before the second call for mas_empty_area
  ...
parents 7a5b6fc8 e7404921

.mailmap

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>

Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>

Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>

Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Documentation/admin-guide/mm/transhuge.rst

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ AnonHugePmdMapped). 
The number of file transparent huge pages mapped to userspace is available

by reading ShmemPmdMapped and ShmemHugePages fields in ``/proc/meminfo``.

To identify what applications are mapping file transparent huge pages, it

is necessary to read ``/proc/PID/smaps`` and count the FileHugeMapped fields

is necessary to read ``/proc/PID/smaps`` and count the FilePmdMapped fields

for each mapping.



Note that reading the smaps file is expensive and reading it

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -14756,7 +14756,7 @@ F: drivers/memory/mtk-smi.c 
F:	include/soc/mediatek/smi.h









MEDIATEK SWITCH DRIVER









M:	Arınç ÜNAL <arinc.unal@arinc9.com>









M:	Chester A. Unal <chester.a.unal@arinc9.com>









M:	Daniel Golle <daniel@makrotopia.org>









M:	DENG Qingfang <dqfext@gmail.com>









M:	Sean Wang <sean.wang@mediatek.com>








@@ -18460,7 +18460,7 @@ F:	Documentation/devicetree/bindings/pinctrl/mediatek,mt8183-pinctrl.yaml







F:	drivers/pinctrl/mediatek/

















PIN CONTROLLER - MEDIATEK MIPS









M:	Arınç ÜNAL <arinc.unal@arinc9.com>









M:	Chester A. Unal <chester.a.unal@arinc9.com>









M:	Sergio Paracuellos <sergio.paracuellos@gmail.com>









L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)









L:	linux-mips@vger.kernel.org








@@ -19504,7 +19504,7 @@ S:	Maintained







F:	arch/mips/ralink

















RALINK MT7621 MIPS ARCHITECTURE









M:	Arınç ÜNAL <arinc.unal@arinc9.com>









M:	Chester A. Unal <chester.a.unal@arinc9.com>









M:	Sergio Paracuellos <sergio.paracuellos@gmail.com>









L:	linux-mips@vger.kernel.org









S:	Maintained

























fs/ocfs2/quota_global.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -893,7 +893,7 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid)







	int status = 0;



















	trace_ocfs2_get_next_id(from_kqid(&init_user_ns, *qid), type);









	if (!sb_has_quota_loaded(sb, type)) {









	if (!sb_has_quota_active(sb, type)) {









		status = -ESRCH;









		goto out;









	}
































fs/ocfs2/quota_local.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -867,6 +867,7 @@ static int ocfs2_local_free_info(struct super_block *sb, int type)







	brelse(oinfo->dqi_libh);









	brelse(oinfo->dqi_lqi_bh);









	kfree(oinfo);









	info->dqi_priv = NULL;









	return status;









}