git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef46808 31e810a)
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)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.