Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 21:49:34 +0000 (06:49 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 21:49:34 +0000 (06:49 +0900)
commit162f73f4b974aa08ab37e9d59f0428edfa8dbc51
treedf617c4f38690d9eabfbff1e22ee659d856cb6a0
parent5ac447d268601f88264ad18a13e7177a455007bb
parentd7143e31259cb029e207619209b31aa7520f8e28
Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "5 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: correct the comment when reclaimed pages exceed the scanned pages
  userfaultfd: shmem: handle coredumping in handle_userfault()
  mm: numa: avoid waiting on freed migrated pages
  swap: cond_resched in swap_cgroup_prepare()
  mm/memory-failure.c: use compound_head() flags for huge pages