tree e0e27a5b34cc11ef74ebeb564333d66e706e3d4d
parent 2592d2ef0448e24878fce24c3fc0ca525f65f286
parent 98da7d08850fb8bdeb395d6368ed15753304aa0c
author Linus Torvalds <torvalds@linux-foundation.org> 1498260652 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1498260652 -0700

Merge branch 'akpm' (patches from Andrew)

Merge misc fixes from Andrew Morton:
 "8 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  fs/exec.c: account for argv/envp pointers
  ocfs2: fix deadlock caused by recursive locking in xattr
  slub: make sysfs file removal asynchronous
  lib/cmdline.c: fix get_options() overflow while parsing ranges
  fs/dax.c: fix inefficiency in dax_writeback_mapping_range()
  autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL
  mm/vmalloc.c: huge-vmap: fail gracefully on unexpected huge vmap mappings
  mm, thp: remove cond_resched from __collapse_huge_page_copy