Merge branch 'akpm' (patches from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Aug 2018 23:41:59 +0000 (16:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Aug 2018 23:41:59 +0000 (16:41 -0700)
commit98d7e1009832da359157fb0917569b43550e7da9
treeb4aea759affac9b3a26a10442841ec0ced8b5f64
parentef46808b79ebbf48587c556436e5281ec51d09b5
parent31e810aa1033a7db50a2746cd34a2432237f6420
Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "3 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  userfaultfd: remove uffd flags from vma->vm_flags if UFFD_EVENT_FORK fails
  ipc/shm.c add ->pagesize function to shm_vm_ops
  memcg: remove memcg_cgroup::id from IDR on mem_cgroup_css_alloc() failure