merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes
authorAndrew Morton <akpm@linux-foundation.org>
Mon, 21 Aug 2023 21:26:20 +0000 (14:26 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 21 Aug 2023 21:26:20 +0000 (14:26 -0700)
21 files changed:
1  2 
MAINTAINERS
fs/proc/task_mmu.c
include/linux/mm.h
include/linux/mm_types.h
mm/compaction.c
mm/damon/core.c
mm/damon/vaddr.c
mm/gup.c
mm/huge_memory.c
mm/hugetlb.c
mm/internal.h
mm/ksm.c
mm/madvise.c
mm/memcontrol.c
mm/memory-failure.c
mm/migrate_device.c
mm/mlock.c
mm/mprotect.c
mm/swapfile.c
mm/vmscan.c
mm/zsmalloc.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/compaction.c
Simple merge
diff --cc mm/damon/core.c
Simple merge
Simple merge
diff --cc mm/gup.c
Simple merge
Simple merge
diff --cc mm/hugetlb.c
Simple merge
diff --cc mm/internal.h
Simple merge
diff --cc mm/ksm.c
Simple merge
diff --cc mm/madvise.c
Simple merge
diff --cc mm/memcontrol.c
Simple merge
Simple merge
Simple merge
diff --cc mm/mlock.c
Simple merge
diff --cc mm/mprotect.c
Simple merge
diff --cc mm/swapfile.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
diff --cc mm/zsmalloc.c
Simple merge