Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Nov 2017 20:54:01 +0000 (12:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Nov 2017 20:54:01 +0000 (12:54 -0800)
Pull misc vfs updates from Al Viro:
 "Assorted stuff, really no common topic here"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: grab the lock instead of blocking in __fd_install during resizing
  vfs: stop clearing close on exec when closing a fd
  include/linux/fs.h: fix comment about struct address_space
  fs: make fiemap work from compat_ioctl
  coda: fix 'kernel memory exposure attempt' in fsync
  pstore: remove unneeded unlikely()
  vfs: remove unneeded unlikely()
  stubs for mount_bdev() and kill_block_super() in !CONFIG_BLOCK case
  make vfs_ustat() static
  do_handle_open() should be static
  elf_fdpic: fix unused variable warning
  fold destroy_super() into __put_super()
  new helper: destroy_unused_super()
  fix address space warnings in ipc/
  acct.h: get rid of detritus

15 files changed:
1  2 
fs/binfmt_elf_fdpic.c
fs/coda/upcall.c
fs/compat_ioctl.c
fs/fhandle.c
fs/file.c
fs/namei.c
fs/pstore/platform.c
fs/statfs.c
fs/super.c
include/linux/acct.h
include/linux/fs.h
ipc/msg.c
ipc/sem.c
ipc/shm.c
ipc/syscall.c

Simple merge
Simple merge
Simple merge
diff --cc fs/fhandle.c
Simple merge
diff --cc fs/file.c
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
diff --cc fs/statfs.c
Simple merge
diff --cc fs/super.c
Simple merge
Simple merge
Simple merge
diff --cc ipc/msg.c
Simple merge
diff --cc ipc/sem.c
Simple merge
diff --cc ipc/shm.c
Simple merge
diff --cc ipc/syscall.c
Simple merge