]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jan 2022 18:37:06 +0000 (20:37 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jan 2022 18:37:06 +0000 (20:37 +0200)
commitf56caedaf94f9ced5dbfcdb0060a3e788d2078af
treee213532d1b3d32f9f0e81948f3b23804baff287d
parenta33f5c380c4bd3fa5278d690421b72052456d9fe
parent76fd0285b447991267e838842c0be7395eb454bb
Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:
 "146 patches.

  Subsystems affected by this patch series: kthread, ia64, scripts,
  ntfs, squashfs, ocfs2, vfs, and mm (slab-generic, slab, kmemleak,
  dax, kasan, debug, pagecache, gup, shmem, frontswap, memremap,
  memcg, selftests, pagemap, dma, vmalloc, memory-failure, hugetlb,
  userfaultfd, vmscan, mempolicy, oom-kill, hugetlbfs, migration, thp,
  ksm, page-poison, percpu, rmap, zswap, zram, cleanups, hmm, and
  damon)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (146 commits)
  mm/damon: hide kernel pointer from tracepoint event
  mm/damon/vaddr: hide kernel pointer from damon_va_three_regions() failure log
  mm/damon/vaddr: use pr_debug() for damon_va_three_regions() failure logging
  mm/damon/dbgfs: remove an unnecessary variable
  mm/damon: move the implementation of damon_insert_region to damon.h
  mm/damon: add access checking for hugetlb pages
  Docs/admin-guide/mm/damon/usage: update for schemes statistics
  mm/damon/dbgfs: support all DAMOS stats
  Docs/admin-guide/mm/damon/reclaim: document statistics parameters
  mm/damon/reclaim: provide reclamation statistics
  mm/damon/schemes: account how many times quota limit has exceeded
  mm/damon/schemes: account scheme actions that successfully applied
  mm/damon: remove a mistakenly added comment for a future feature
  Docs/admin-guide/mm/damon/usage: update for kdamond_pid and (mk|rm)_contexts
  Docs/admin-guide/mm/damon/usage: mention tracepoint at the beginning
  Docs/admin-guide/mm/damon/usage: remove redundant information
  Docs/admin-guide/mm/damon/usage: update for scheme quotas and watermarks
  mm/damon: convert macro functions to static inline functions
  mm/damon: modify damon_rand() macro to static inline function
  mm/damon: move damon_rand() definition into damon.h
  ...
42 files changed:
MAINTAINERS
arch/Kconfig
arch/arm/mm/fault.c
arch/arm64/mm/fault.c
arch/parisc/mm/fault.c
arch/powerpc/mm/fault.c
arch/s390/mm/fault.c
arch/um/kernel/trap.c
arch/x86/Kconfig
arch/x86/include/asm/pgtable.h
drivers/block/zram/zram_drv.c
drivers/dax/bus.c
drivers/dax/bus.h
drivers/dax/device.c
drivers/of/fdt.c
fs/ext4/extents.c
fs/xfs/xfs_buf.c
include/linux/fs.h
include/linux/kasan.h
include/linux/memcontrol.h
include/linux/memremap.h
include/linux/mm.h
include/linux/mm_types.h
include/linux/page-flags.h
kernel/fork.c
kernel/rcu/rcutorture.c
kernel/sysctl.c
mm/Makefile
mm/huge_memory.c
mm/internal.h
mm/kasan/quarantine.c
mm/khugepaged.c
mm/memcontrol.c
mm/memory-failure.c
mm/memory.c
mm/memremap.c
mm/migrate.c
mm/shmem.c
mm/slab.h
mm/slab_common.c
mm/swap.c
mm/truncate.c