Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Nov 2021 21:08:17 +0000 (14:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Nov 2021 21:08:17 +0000 (14:08 -0700)
commit512b7931ad0561ffe14265f9ff554a3c081b476b
treea94450d08468e094d2d92a495de4650faab09c1f
parentfe91c4725aeed35023ba4f7a1e1adfebb6878c23
parent658f9ae761b5965893727dd4edcdad56e5a439bb
Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:
 "257 patches.

  Subsystems affected by this patch series: scripts, ocfs2, vfs, and
  mm (slab-generic, slab, slub, kconfig, dax, kasan, debug, pagecache,
  gup, swap, memcg, pagemap, mprotect, mremap, iomap, tracing, vmalloc,
  pagealloc, memory-failure, hugetlb, userfaultfd, vmscan, tools,
  memblock, oom-kill, hugetlbfs, migration, thp, readahead, nommu, ksm,
  vmstat, madvise, memory-hotplug, rmap, zsmalloc, highmem, zram,
  cleanups, kfence, and damon)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (257 commits)
  mm/damon: remove return value from before_terminate callback
  mm/damon: fix a few spelling mistakes in comments and a pr_debug message
  mm/damon: simplify stop mechanism
  Docs/admin-guide/mm/pagemap: wordsmith page flags descriptions
  Docs/admin-guide/mm/damon/start: simplify the content
  Docs/admin-guide/mm/damon/start: fix a wrong link
  Docs/admin-guide/mm/damon/start: fix wrong example commands
  mm/damon/dbgfs: add adaptive_targets list check before enable monitor_on
  mm/damon: remove unnecessary variable initialization
  Documentation/admin-guide/mm/damon: add a document for DAMON_RECLAIM
  mm/damon: introduce DAMON-based Reclamation (DAMON_RECLAIM)
  selftests/damon: support watermarks
  mm/damon/dbgfs: support watermarks
  mm/damon/schemes: activate schemes based on a watermarks mechanism
  tools/selftests/damon: update for regions prioritization of schemes
  mm/damon/dbgfs: support prioritization weights
  mm/damon/vaddr,paddr: support pageout prioritization
  mm/damon/schemes: prioritize regions within the quotas
  mm/damon/selftests: support schemes quotas
  mm/damon/dbgfs: support quotas of schemes
  ...
77 files changed:
Documentation/admin-guide/kernel-parameters.txt
Documentation/translations/zh_CN/core-api/memory-hotplug.rst
MAINTAINERS
Makefile
arch/arm64/Kconfig
arch/arm64/mm/mmu.c
arch/mips/loongson64/init.c
arch/powerpc/configs/skiroot_defconfig
arch/powerpc/include/asm/machdep.h
arch/powerpc/kernel/setup-common.c
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/platforms/pseries/svm.c
arch/s390/kernel/uv.c
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-se/7724/setup.c
arch/x86/Kconfig
arch/x86/xen/mmu_pv.c
drivers/block/zram/zram_drv.c
drivers/hwmon/occ/p9_sbe.c
drivers/macintosh/smu.c
drivers/virtio/Kconfig
drivers/xen/swiotlb-xen.c
fs/open.c
include/linux/backing-dev.h
include/linux/compiler-gcc.h
include/linux/compiler_types.h
include/linux/fs.h
include/linux/gfp.h
include/linux/highmem.h
include/linux/kasan.h
include/linux/kernel.h
include/linux/memcontrol.h
include/linux/migrate.h
include/linux/mm.h
include/linux/mm_types.h
include/linux/page-flags.h
include/linux/swap.h
include/trace/events/writeback.h
init/main.c
kernel/dma/swiotlb.c
kernel/locking/lockdep.c
kernel/printk/printk.c
kernel/sched/topology.c
kernel/workqueue.c
lib/Kconfig.debug
lib/bootconfig.c
lib/test_kasan.c
mm/backing-dev.c
mm/compaction.c
mm/debug.c
mm/filemap.c
mm/gup.c
mm/highmem.c
mm/hugetlb.c
mm/internal.h
mm/kasan/kasan.h
mm/khugepaged.c
mm/memcontrol.c
mm/memory-failure.c
mm/memory.c
mm/mempolicy.c
mm/migrate.c
mm/nommu.c
mm/oom_kill.c
mm/page-writeback.c
mm/page_alloc.c
mm/readahead.c
mm/rmap.c
mm/shmem.c
mm/slub.c
mm/swap.c
mm/swapfile.c
mm/userfaultfd.c
mm/vmscan.c
net/ipv4/tcp.c
net/netfilter/ipvs/ip_vs_ctl.c
security/Kconfig