2018-05-10-16-34 merged

Andrew Morton (1):

Andy Shevchenko (2):
      mm/vmpressure.c: use kstrndup instead of kmalloc+strncpy
      mm/vmpressure.c: convert to use match_string() helper

Canjiang Lu (1):
      mm/slub: remove obsolete comment

Eric W. Biederman (2):
      memcg: update the mm->memcg maintenance to work when !CONFIG_MMU
      memcg: close the race between migration and installing bprm->mm as mm

Huaisheng Ye (1):
      mm/page_alloc.c: remove useless parameter of finalise_ac()

Huang Ying (1):
      mm: /proc/pid/pagemap: hide swap entries from unprivileged users

Jia He (1):
      mm/ksm.c: ignore STABLE_FLAG of rmap_item->address in rmap_walk_ksm()

Jonathan Cameron (1):
      mm/memory_hotplug: fix leftover use of struct page during hotplug

Junaid Shahid (1):
      mm: memcontrol: drain memcg stock on force_empty

Mathieu Malaterre (2):
      mm/slub.c: add __printf verification to slab_err()
      mm: move is_pageblock_removable_nolock() to mm/memory_hotplug.c

Matthew Wilcox (1):
      lib/test_bitmap.c: fix bitmap optimisation tests to report errors correctly

Michal Hocko (3):
      Reverted "prctl: don't compile some of prctl functions when CRUI disabled"
      Reverted "prctl: remove non PR_SET_MM_MAP operations"
      Reverted "mm: access to uninitialized struct page"

Minchan Kim (2):
      mm/memblock: print memblock_remove

Pavel Tatashin (1):
      mm: allow deferred page init for vmemmap only

Roman Gushchin (3):
      memcg: introduce memory.min
      mm: fix oom_kill event handling

Ross Zwisler (5):
      radix tree test suite: fix mapshift build target
      radix tree test suite: fix compilation issue
      radix tree test suite: add item_delete_rcu()
      radix tree test suite: multi-order iteration race
      radix tree: fix multi-order iteration race

Sebastian Andrzej Siewior (1):
      rbtree: include rcu.h

Shakeel Butt (1):
      mm: memcontrol: drain stocks on resize limit

Souptick Joarder (1):
      include/linux/mm.h: add new inline function vmf_error()
mm: fix oom_kill event handling

e27be240df53 ("mm: memcg: make sure memory.events is uptodate when waking
pollers") converted most of memcg event counters to per-memcg atomics,
which made them less confusing for a user.  The "oom_kill" counter
remained untouched, so now it behaves differently than other counters
(including "oom").  This adds nothing but confusion.

Let's fix this by adding the MEMCG_OOM_KILL event, and follow the
MEMCG_OOM approach.  This also removes a hack from count_memcg_event_mm(),
introduced earlier specially for the OOM_KILL counter.

Link: http://lkml.kernel.org/r/20180508124637.29984-1-guro@fb.com
Signed-off-by: Roman Gushchin <guro@fb.com>
Acked-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
3 files changed