Merge branch 'mm-hotfixes-stable' into mm-stable to pick up

already-upstream changes to memcontrol.c, needed by "memcg: move mem_cgroup_swappiness and vm_swappiness to mm/swap.h".
2026-11-10 20:48:12 +00:00 · 2026-08-24 18:40:27 -07:00 · 2026-08-24 18:40:27 -07:00 · 4b47e81e56
commit 4b47e81e56
parent 08745c6235 aedf2efd18
22 changed files with 346 additions and 190 deletions
--- a/.mailmap
+++ b/.mailmap
--- a/5
+++ b/5
--- a/arch/arm64/include/asm/ptdump.h
+++ b/arch/arm64/include/asm/ptdump.h
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
--- a/arch/arm64/mm/ptdump.c
+++ b/arch/arm64/mm/ptdump.c
--- a/arch/microblaze/kernel/head.S
+++ b/arch/microblaze/kernel/head.S
--- a/include/linux/mmap_lock.h
+++ b/include/linux/mmap_lock.h
--- a/mm/damon/lru_sort.c
+++ b/mm/damon/lru_sort.c
--- a/mm/damon/ops-common.c
+++ b/mm/damon/ops-common.c
--- a/mm/damon/paddr.c
+++ b/mm/damon/paddr.c
--- a/mm/damon/reclaim.c
+++ b/mm/damon/reclaim.c
--- a/mm/damon/vaddr.c
+++ b/mm/damon/vaddr.c
--- a/mm/filemap.c
+++ b/mm/filemap.c
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
--- a/mm/page_table_check.c
+++ b/mm/page_table_check.c
--- a/mm/pagewalk.c
+++ b/mm/pagewalk.c
--- a/mm/ptdump.c
+++ b/mm/ptdump.c
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
--- a/samples/damon/mtier.c
+++ b/samples/damon/mtier.c