Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:

 - a few hotfixes

 - various misc updates

 - ocfs2 updates

 - most of MM

* emailed patches from Andrew Morton <[email protected]>: (108 commits)
  mm, memory_hotplug: move movable_node to the hotplug proper
  mm, memory_hotplug: drop CONFIG_MOVABLE_NODE
  mm, memory_hotplug: drop artificial restriction on online/offline
  mm: memcontrol: account slab stats per lruvec
  mm: memcontrol: per-lruvec stats infrastructure
  mm: memcontrol: use generic mod_memcg_page_state for kmem pages
  mm: memcontrol: use the node-native slab memory counters
  mm: vmstat: move slab statistics from zone to node counters
  mm/zswap.c: delete an error message for a failed memory allocation in zswap_dstmem_prepare()
  mm/zswap.c: improve a size determination in zswap_frontswap_init()
  mm/zswap.c: delete an error message for a failed memory allocation in zswap_pool_create()
  mm/swapfile.c: sort swap entries before free
  mm/oom_kill: count global and memory cgroup oom kills
  mm: per-cgroup memory reclaim stats
  mm: kmemleak: treat vm_struct as alternative reference to vmalloc'ed objects
  mm: kmemleak: factor object reference updating out of scan_block()
  mm: kmemleak: slightly reduce the size of some structures on 64-bit architectures
  mm, mempolicy: don't check cpuset seqlock where it doesn't matter
  mm, cpuset: always use seqlock when changing task's nodemask
  mm, mempolicy: simplify rebinding mempolicies when updating cpusets
  ...

diff --combined Documentation/admin-guide/kernel-parameters.txt
index aa1d4409fe0aee0f7af9b7084e8f6e0fd7f697d0,dd7abbea818803e829ccb55bcc3a720d12aaa53f..d9c171ce4190845950e7c14e362265b4d26adc74
--- 1/Documentation/admin-guide/kernel-parameters.txt
--- 2/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -1862,18 -1862,6 +1862,18 @@@
                        for all guests.
                        Default is 1 (enabled) if in 64-bit or 32-bit PAE mode.
  
 +      kvm-arm.vgic_v3_group0_trap=
 +                      [KVM,ARM] Trap guest accesses to GICv3 group-0
 +                      system registers
 +
 +      kvm-arm.vgic_v3_group1_trap=
 +                      [KVM,ARM] Trap guest accesses to GICv3 group-1
 +                      system registers
 +
 +      kvm-arm.vgic_v3_common_trap=
 +                      [KVM,ARM] Trap guest accesses to GICv3 common
 +                      system registers
 +
        kvm-intel.ept=  [KVM,Intel] Disable extended page tables
                        (virtualized MMU) support on capable Intel chips.
                        Default is 1 (enabled)
@@@ -2315,8 -2303,11 +2315,11 @@@
                        that the amount of memory usable for all allocations
                        is not too small.
  
-       movable_node    [KNL] Boot-time switch to enable the effects
-                       of CONFIG_MOVABLE_NODE=y. See mm/Kconfig for details.
+       movable_node    [KNL] Boot-time switch to make hotplugable memory
+                       NUMA nodes to be movable. This means that the memory
+                       of such nodes will be usable only for movable
+                       allocations which rules out almost all kernel
+                       allocations. Use with caution!
  
        MTD_Partition=  [MTD]
                        Format: <name>,<region-number>,<size>,<offset>
@@@ -3772,8 -3763,14 +3775,14 @@@
        slab_nomerge    [MM]
                        Disable merging of slabs with similar size. May be
                        necessary if there is some reason to distinguish
-                       allocs to different slabs. Debug options disable
-                       merging on their own.
+                       allocs to different slabs, especially in hardened
+                       environments where the risk of heap overflows and
+                       layout control by attackers can usually be
+                       frustrated by disabling merging. This will reduce
+                       most of the exposure of a heap attack to a single
+                       cache (risks via metadata attacks are mostly
+                       unchanged). Debug options disable merging on their
+                       own.
                        For more information see Documentation/vm/slub.txt.
  
        slab_max_order= [MM, SLAB]

diff --combined arch/arm64/Kconfig
index 192208ea284224dd73c5bd663d5b21e4c6caf347,ff925ece82d66080b775b83be7fa7190df0f4ac5..8addb851ab5e3288b1a3c89dc6128cdf63779613
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -13,7 -13,7 +13,7 @@@ config ARM6
        select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_GCOV_PROFILE_ALL
-       select ARCH_HAS_GIGANTIC_PAGE
+       select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA
        select ARCH_HAS_KCOV
        select ARCH_HAS_SET_MEMORY
        select ARCH_HAS_SG_CHAIN
@@@ -488,17 -488,6 +488,17 @@@ config CAVIUM_ERRATUM_2745
  
          If unsure, say Y.
  
 +config CAVIUM_ERRATUM_30115
 +      bool "Cavium erratum 30115: Guest may disable interrupts in host"
 +      default y
 +      help
 +        On ThunderX T88 pass 1.x through 2.2, T81 pass 1.0 through
 +        1.2, and T83 Pass 1.0, KVM guest execution may disable
 +        interrupts in host. Trapping both GICv3 group-0 and group-1
 +        accesses sidesteps the issue.
 +
 +        If unsure, say Y.
 +
  config QCOM_FALKOR_ERRATUM_1003
        bool "Falkor E1003: Incorrect translation due to ASID change"
        default y

diff --combined kernel/module.c
index 1d958c6d5c24dbae47e55508c19ac4ed60bbd55e,8f883d86cedc0227eca1f3328117d82dde8bc496..b3dbdde82e8037e327e2f41dd70650986d5aacc9
--- 1/kernel/module.c
--- 2/kernel/module.c
+++ b/kernel/module.c
@@@ -49,9 -49,7 +49,7 @@@
  #include <linux/rculist.h>
  #include <linux/uaccess.h>
  #include <asm/cacheflush.h>
- #ifdef CONFIG_STRICT_MODULE_RWX
- #include <asm/set_memory.h>
- #endif
+ #include <linux/set_memory.h>
  #include <asm/mmu_context.h>
  #include <linux/license.h>
  #include <asm/sections.h>
@@@ -3074,9 -3072,9 +3072,9 @@@ static int find_module_sections(struct 
        mod->trace_events = section_objs(info, "_ftrace_events",
                                         sizeof(*mod->trace_events),
                                         &mod->num_trace_events);
 -      mod->trace_enums = section_objs(info, "_ftrace_enum_map",
 -                                      sizeof(*mod->trace_enums),
 -                                      &mod->num_trace_enums);
 +      mod->trace_evals = section_objs(info, "_ftrace_eval_map",
 +                                      sizeof(*mod->trace_evals),
 +                                      &mod->num_trace_evals);
  #endif
  #ifdef CONFIG_TRACING
        mod->trace_bprintk_fmt_start = section_objs(info, "__trace_printk_fmt",