From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 May 2017 18:38:06 +0000 (-0700)
Subject: Merge branch 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v4.14-rc1~1028
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da7b66ffb2815800440d9e1649282a27c805304f;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'work.splice' of git://git./linux/kernel/git/viro/vfs

Pull splice updates from Al Viro:
 "These actually missed the last cycle; the branch itself is from last
  December"

* 'work.splice' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  make nr_pages calculation in default_file_splice_read() a bit less ugly
  splice/tee/vmsplice: validate flags
  splice_pipe_desc: kill ->flags
  remove spd_release_page()
---

da7b66ffb2815800440d9e1649282a27c805304f