]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 18:51:59 +0000 (11:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 May 2016 18:51:59 +0000 (11:51 -0700)
Pull misc vfs cleanups from Al Viro:
 "Assorted cleanups and fixes all over the place"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  coredump: only charge written data against RLIMIT_CORE
  coredump: get rid of coredump_params->written
  ecryptfs_lookup(): try either only encrypted or plaintext name
  ecryptfs: avoid multiple aliases for directories
  bpf: reject invalid names right in ->lookup()
  __d_alloc(): treat NULL name as QSTR("/", 1)
  mtd: switch ubi_open_volume_path() to vfs_stat()
  mtd: switch open_mtd_by_chdev() to use of vfs_stat()

1  2 
fs/binfmt_elf.c
fs/binfmt_elf_fdpic.c
fs/dcache.c
fs/ecryptfs/inode.c
kernel/bpf/inode.c

diff --cc fs/binfmt_elf.c
Simple merge
Simple merge
diff --cc fs/dcache.c
Simple merge
Simple merge
Simple merge