Merge branch 'akpm' (patches from Andrew)

Browse source

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

...

This commit is contained in:

Linus Torvalds 2018-08-02 16:41:59 -07:00

parent ef46808b79 31e810aa10

commit 98d7e10098

4 changed files with 33 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

fs/userfaultfd.c

View file

12

ipc/shm.c

View file

7

mm/hugetlb.c

View file

15

mm/memcontrol.c

View file