Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:
 "A few small subsystems and some of MM.

  172 patches.

  Subsystems affected by this patch series: hexagon, scripts, ntfs,
  ocfs2, vfs, and mm (slab-generic, slab, slub, debug, pagecache, swap,
  memcg, pagemap, mprotect, mremap, page-reporting, vmalloc, kasan,
  pagealloc, memory-failure, hugetlb, vmscan, z3fold, compaction,
  mempolicy, oom-kill, hugetlbfs, and migration)"

* emailed patches from Andrew Morton <[email protected]>: (172 commits)
  mm/migrate: remove unneeded semicolons
  hugetlbfs: remove unneeded return value of hugetlb_vmtruncate()
  hugetlbfs: fix some comment typos
  hugetlbfs: correct some obsolete comments about inode i_mutex
  hugetlbfs: make hugepage size conversion more readable
  hugetlbfs: remove meaningless variable avoid_reserve
  hugetlbfs: correct obsolete function name in hugetlbfs_read_iter()
  hugetlbfs: use helper macro default_hstate in init_hugetlbfs_fs
  hugetlbfs: remove useless BUG_ON(!inode) in hugetlbfs_setattr()
  hugetlbfs: remove special hugetlbfs_set_page_dirty()
  mm/hugetlb: change hugetlb_reserve_pages() to type bool
  mm, oom: fix a comment in dump_task()
  mm/mempolicy: use helper range_in_vma() in queue_pages_test_walk()
  numa balancing: migrate on fault among multiple bound nodes
  mm, compaction: make fast_isolate_freepages() stay within zone
  mm/compaction: fix misbehaviors of fast_find_migrateblock()
  mm/compaction: correct deferral logic for proactive compaction
  mm/compaction: remove duplicated VM_BUG_ON_PAGE !PageLocked
  mm/compaction: remove rcu_read_lock during page compaction
  z3fold: simplify the zhdr initialization code in init_z3fold_page()
  ...

diff --combined Documentation/admin-guide/kernel-parameters.txt
index 186ad235bf325995fedea62f05f6f062da33d915,19cfa8b9eb60781db6176ccd4a8325b6eb028d62..bab6a8b01202ebc07b8e8bb471363a662f2c9a49
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1434,11 -1434,6 +1434,11 @@@
                                to enforce probe and suspend/resume ordering.
                        rpm --  Like "on", but also use to order runtime PM.
  
 +      fw_devlink.strict=<bool>
 +                      [KNL] Treat all inferred dependencies as mandatory
 +                      dependencies. This only applies for fw_devlink=on|rpm.
 +                      Format: <bool>
 +
        gamecon.map[2|3]=
                        [HW,JOY] Multisystem joystick and NES/SNES/PSX pad
                        support via parallel port (up to 5 devices per port)
@@@ -4904,14 -4899,6 +4904,6 @@@
                        last alloc / free. For more information see
                        Documentation/vm/slub.rst.
  
-       slub_memcg_sysfs=       [MM, SLUB]
-                       Determines whether to enable sysfs directories for
-                       memory cgroup sub-caches. 1 to enable, 0 to disable.
-                       The default is determined by CONFIG_SLUB_MEMCG_SYSFS_ON.
-                       Enabling this can lead to a very high number of debug
-                       directories and files being created under
-                       /sys/kernel/slub.
- 
        slub_max_order= [MM, SLUB]
                        Determines the maximum allowed order for slabs.
                        A high setting may cause OOMs due to memory
@@@ -5990,6 -5977,12 +5982,6 @@@
                        default x2apic cluster mode on platforms
                        supporting x2apic.
  
 -      x86_intel_mid_timer= [X86-32,APBT]
 -                      Choose timer option for x86 Intel MID platform.
 -                      Two valid options are apbt timer only and lapic timer
 -                      plus one apbt timer for broadcast timer.
 -                      x86_intel_mid_timer=apbt_only | lapic_and_apbt
 -
        xen_512gb_limit         [KNL,X86-64,XEN]
                        Restricts the kernel running paravirtualized under Xen
                        to use only up to 512 GB of RAM. The reason to do so is

diff --combined init/Kconfig
index c2a18f56e944da230191452f693d42bfc9c19577,8f3a6c4fc0b47996f74eefdf323335151fc7e709..0bf5b340b80eff0c6abc273ced686993b2dabb98
--- 1/init/Kconfig
--- 2/init/Kconfig
+++ b/init/Kconfig
@@@ -1861,20 -1861,6 +1861,6 @@@ config SLUB_DEBU
          SLUB sysfs support. /sys/slab will not exist and there will be
          no support for cache validation etc.
  
- config SLUB_MEMCG_SYSFS_ON
-       default n
-       bool "Enable memcg SLUB sysfs support by default" if EXPERT
-       depends on SLUB && SYSFS && MEMCG
-       help
-         SLUB creates a directory under /sys/kernel/slab for each
-         allocation cache to host info and debug files. If memory
-         cgroup is enabled, each cache can have per memory cgroup
-         caches. SLUB can create the same sysfs directories for these
-         caches under /sys/kernel/slab/CACHE/cgroup but it can lead
-         to a very high number of debug files being created. This is
-         controlled by slub_memcg_sysfs boot parameter and this
-         config option determines the parameter's default value.
- 
  config COMPAT_BRK
        bool "Disable heap randomization"
        default y
@@@ -2273,8 -2259,8 +2259,8 @@@ config MODULE_ALLOW_MISSING_NAMESPACE_I
          If unsure, say N.
  
  config TRIM_UNUSED_KSYMS
 -      bool "Trim unused exported kernel symbols"
 -      depends on BROKEN
 +      bool "Trim unused exported kernel symbols" if EXPERT
 +      depends on !COMPILE_TEST
        help
          The kernel and some modules make many symbols available for
          other modules to use via EXPORT_SYMBOL() and variants. Depending