Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2019 20:27:20 +0000 (13:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2019 20:27:20 +0000 (13:27 -0700)
Pull misc vfs updates from Al Viro:
 "Assorted fixes (really no common topic here)"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: Make __vfs_write() static
  vfs: fix preadv64v2 and pwritev64v2 compat syscalls with offset == -1
  pipe: stop using ->can_merge
  splice: don't merge into linked buffers
  fs: move generic stat response attr handling to vfs_getattr_nosec
  orangefs: don't reinitialize result_mask in ->getattr
  fs/devpts: always delete dcache dentry-s in dput()

1  2 
fs/pipe.c
fs/read_write.c
fs/splice.c
kernel/relay.c
kernel/trace/trace.c

diff --cc fs/pipe.c
Simple merge
diff --cc fs/read_write.c
Simple merge
diff --cc fs/splice.c
Simple merge
diff --cc kernel/relay.c
Simple merge
Simple merge