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
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arm/mm/fault.c
Simple merge

diff --cc arch/arm64/mm/fault.c
Simple merge

diff --cc arch/parisc/mm/fault.c
Simple merge

diff --cc arch/powerpc/mm/fault.c
Simple merge

diff --cc arch/s390/mm/fault.c
Simple merge

diff --cc arch/um/kernel/trap.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/pgtable.h
Simple merge

diff --cc drivers/block/zram/zram_drv.c
Simple merge

diff --cc drivers/dax/bus.c
Simple merge

diff --cc drivers/dax/bus.h
index 381cec9ff05c4f92e6be660ccdf685c71322e81a,4acdfee7dd5956b77a67115993d01c26ff5c52c6..fbb940293d6d84384b6fa37eb412790249b4ecf7
--- 1/drivers/dax/bus.h
--- 2/drivers/dax/bus.h
+++ b/drivers/dax/bus.h
@@@ -39,7 -48,12 +39,8 @@@ int __dax_driver_register(struct dax_de
        __dax_driver_register(driver, THIS_MODULE, KBUILD_MODNAME)
  void dax_driver_unregister(struct dax_device_driver *dax_drv);
  void kill_dev_dax(struct dev_dax *dev_dax);
+ bool static_dev_dax(struct dev_dax *dev_dax);
  
 -#if IS_ENABLED(CONFIG_DEV_DAX_PMEM_COMPAT)
 -int dev_dax_probe(struct dev_dax *dev_dax);
 -#endif
 -
  /*
   * While run_dax() is potentially a generic operation that could be
   * defined in include/linux/dax.h we don't want to grow any users

diff --cc drivers/dax/device.c
Simple merge

diff --cc drivers/of/fdt.c
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/kasan.h
Simple merge

diff --cc include/linux/memcontrol.h
Simple merge

diff --cc include/linux/memremap.h
index a8bc588fe7aa8b2d0287484430ba9e79916b5971,61a6a0e27359d5307fb90fc9bd2afd1db006097d..1fafcc38acbad66229442a33699d7faa4a73dd58
--- 1/include/linux/memremap.h
--- 2/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@@ -85,9 -95,15 +85,14 @@@ struct dev_pagemap_ops 
   * struct dev_pagemap - metadata for ZONE_DEVICE mappings
   * @altmap: pre-allocated/reserved memory for vmemmap allocations
   * @ref: reference count that pins the devm_memremap_pages() mapping
 - * @internal_ref: internal reference if @ref is not provided by the caller
 - * @done: completion for @internal_ref
 + * @done: completion for @ref
   * @type: memory type: see MEMORY_* in memory_hotplug.h
   * @flags: PGMAP_* flags to specify defailed behavior
+  * @vmemmap_shift: structural definition of how the vmemmap page metadata
+  *      is populated, specifically the metadata page order.
+  *    A zero value (default) uses base pages as the vmemmap metadata
+  *    representation. A bigger value will set up compound struct pages
+  *    of the requested order value.
   * @ops: method table
   * @owner: an opaque pointer identifying the entity that manages this
   *    instance.  Used by various helpers to make sure that no

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/mm_types.h
Simple merge

diff --cc include/linux/page-flags.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/rcu/rcutorture.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/Makefile
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/internal.h
Simple merge

diff --cc mm/kasan/quarantine.c
Simple merge

diff --cc mm/khugepaged.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

diff --cc mm/memory-failure.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/memremap.c
index 643965da13a60b0d4611efac33a7e17112767f08,a2869d8519a207189c24a72ed068a8816dde4eb3..6aa5f0c2d11fda56628243cbbf38561ae3bc03b9
--- 1/mm/memremap.c
--- 2/mm/memremap.c
+++ b/mm/memremap.c
@@@ -110,8 -116,33 +116,9 @@@ static unsigned long pfn_len(struct dev
  }
  
  #define for_each_device_pfn(pfn, map, i) \
-       for (pfn = pfn_first(map, i); pfn < pfn_end(map, i); pfn = pfn_next(pfn))
+       for (pfn = pfn_first(map, i); pfn < pfn_end(map, i); \
+            pfn = pfn_next(map, pfn))
  
 -static void dev_pagemap_kill(struct dev_pagemap *pgmap)
 -{
 -      if (pgmap->ops && pgmap->ops->kill)
 -              pgmap->ops->kill(pgmap);
 -      else
 -              percpu_ref_kill(pgmap->ref);
 -}
 -
 -static void dev_pagemap_cleanup(struct dev_pagemap *pgmap)
 -{
 -      if (pgmap->ops && pgmap->ops->cleanup) {
 -              pgmap->ops->cleanup(pgmap);
 -      } else {
 -              wait_for_completion(&pgmap->done);
 -              percpu_ref_exit(pgmap->ref);
 -      }
 -      /*
 -       * Undo the pgmap ref assignment for the internal case as the
 -       * caller may re-enable the same pgmap.
 -       */
 -      if (pgmap->ref == &pgmap->internal_ref)
 -              pgmap->ref = NULL;
 -}
 -
  static void pageunmap_range(struct dev_pagemap *pgmap, int range_id)
  {
        struct range *range = &pgmap->ranges[range_id];
@@@ -271,8 -302,7 +278,7 @@@ static int pagemap_range(struct dev_pag
        memmap_init_zone_device(&NODE_DATA(nid)->node_zones[ZONE_DEVICE],
                                PHYS_PFN(range->start),
                                PHYS_PFN(range_len(range)), pgmap);
-       percpu_ref_get_many(&pgmap->ref,
-               pfn_end(pgmap, range_id) - pfn_first(pgmap, range_id));
 -      percpu_ref_get_many(pgmap->ref, pfn_len(pgmap, range_id));
++      percpu_ref_get_many(&pgmap->ref, pfn_len(pgmap, range_id));
        return 0;
  
  err_add_memory:

diff --cc mm/migrate.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc mm/slab.h
Simple merge

diff --cc mm/slab_common.c
Simple merge

diff --cc mm/swap.c
Simple merge

diff --cc mm/truncate.c
index 5c87cdc70e7bf5c60614d445910042ac39a23cc2,41b8249b3b4aa0a9194f21b6d254f52585f56ead..5e243d7269c0f9d2e70625b70ecca9c4ae4f439c
--- 1/mm/truncate.c
--- 2/mm/truncate.c
+++ b/mm/truncate.c
@@@ -213,18 -212,18 +212,16 @@@ invalidate_complete_page(struct address
        if (page_has_private(page) && !try_to_release_page(page, 0))
                return 0;
  
-       ret = remove_mapping(mapping, page);
- 
-       return ret;
+       return remove_mapping(mapping, page);
  }
  
 -int truncate_inode_page(struct address_space *mapping, struct page *page)
 +int truncate_inode_folio(struct address_space *mapping, struct folio *folio)
  {
 -      VM_BUG_ON_PAGE(PageTail(page), page);
 -
 -      if (page->mapping != mapping)
 +      if (folio->mapping != mapping)
                return -EIO;
  
 -      truncate_cleanup_page(page);
 -      delete_from_page_cache(page);
 +      truncate_cleanup_folio(folio);
 +      filemap_remove_folio(folio);
        return 0;
  }