• L
    Merge branch 'akpm' (patches from Andrew) · 9f45efb9
    Linus Torvalds 提交于
    Merge misc updates from Andrew Morton:
    
     - a few hotfixes
    
     - various misc updates
    
     - ocfs2 updates
    
     - most of MM
    
    * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (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
      ...
    9f45efb9
Kconfig 33.8 KB