diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 20:38:06 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 20:38:06 +0200 |
commit | da7b66ffb2815800440d9e1649282a27c805304f (patch) | |
tree | 59e1cbab628f69afddd80e1eecaa18b2c6a02b92 /fs/fs_pin.c | |
parent | Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | make nr_pages calculation in default_file_splice_read() a bit less ugly (diff) | |
download | linux-da7b66ffb2815800440d9e1649282a27c805304f.tar.xz linux-da7b66ffb2815800440d9e1649282a27c805304f.zip |
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()
Diffstat (limited to 'fs/fs_pin.c')
0 files changed, 0 insertions, 0 deletions