Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2016 20:38:49 +0000 (13:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2016 20:38:49 +0000 (13:38 -0700)
commitfed41f7d039bad02f94cad9059e4b14cd81d13f2
treefb9de8dfd1e706a0657e213d5d3cd9368b9e58e4
parentabb5a14fa20fdd400995926134b7be9eb8ce6048
parentcd27e455042da85b088bdd3a6e00da1d5b4df9f1
Merge branch 'work.splice_read' of git://git./linux/kernel/git/viro/vfs

Pull splice fixups from Al Viro:
 "A couple of fixups for interaction of pipe-backed iov_iter with
  O_DIRECT reads + constification of a couple of primitives in uio.h
  missed by previous rounds.

  Kudos to davej - his fuzzing has caught those bugs"

* 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [btrfs] fix check_direct_IO() for non-iovec iterators
  constify iov_iter_count() and iter_is_iovec()
  fix ITER_PIPE interaction with direct_IO
fs/btrfs/inode.c
fs/xfs/xfs_file.c
include/linux/uio.h
mm/filemap.c