| commit | da7b66ffb2815800440d9e1649282a27c805304f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 02 11:38:06 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 02 11:38:06 2017 -0700 |
| tree | 59e1cbab628f69afddd80e1eecaa18b2c6a02b92 | |
| parent | 5b13475a5e12c49c24422ba1bd9998521dec1d4e [diff] | |
| parent | 13c0f52beb6310b9c08804c0929901f70abd211a [diff] |
Merge branch 'work.splice' of git://git.kernel.org/pub/scm/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()