Merge branch 'akpm' (patches from Andrew)

Merge updates from Andrew Morton:
 "142 patches:

   - DAX updates

   - various misc bits

   - OCFS2 updates

   - most of MM"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (142 commits)
  mm/z3fold.c: limit first_num to the actual range of possible buddy indexes
  mm: fix <linux/pagemap.h> stray kernel-doc notation
  zram: remove obsolete sysfs attrs
  mm/memblock.c: remove unnecessary log and clean up
  oom-reaper: use madvise_dontneed() logic to decide if unmap the VMA
  mm: drop unused argument of zap_page_range()
  mm: drop zap_details::check_swap_entries
  mm: drop zap_details::ignore_dirty
  mm, page_alloc: warn_alloc nodemask is NULL when cpusets are disabled
  mm: help __GFP_NOFAIL allocations which do not trigger OOM killer
  mm, oom: do not enforce OOM killer for __GFP_NOFAIL automatically
  mm: consolidate GFP_NOFAIL checks in the allocator slowpath
  lib/show_mem.c: teach show_mem to work with the given nodemask
  arch, mm: remove arch specific show_mem
  mm, page_alloc: warn_alloc print nodemask
  mm, page_alloc: do not report all nodes in show_mem
  Revert "mm: bail out in shrink_inactive_list()"
  mm, vmscan: consider eligible zones in get_scan_count
  mm, vmscan: cleanup lru size claculations
  mm, vmscan: do not count freed pages as PGDEACTIVATE
  ...

1 files changed, 14 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 483ad679aa37..8c39615165b7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1781,6 +1781,20 @@ config SLUB_DEBUG
           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