diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 09:19:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 09:19:01 -0800 |
| commit | c5e4ca6da93f69939542385ca23d7ccebddc3f7d (patch) | |
| tree | da01507b6d050f5ac9face51a7be904ed5cc18dd /net | |
| parent | Merge tag 'ceph-for-4.9-rc5' of git://github.com/ceph/ceph-client (diff) | |
| parent | splice: remove detritus from generic_file_splice_read() (diff) | |
| download | linux-dev-c5e4ca6da93f69939542385ca23d7ccebddc3f7d.tar.xz linux-dev-c5e4ca6da93f69939542385ca23d7ccebddc3f7d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull VFS fixes from Al Viro:
"Christoph's and Jan's aio fixes, fixup for generic_file_splice_read
(removal of pointless detritus that actually breaks it when used for
gfs2 ->splice_read()) and fixup for generic_file_read_iter()
interaction with ITER_PIPE destinations."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
splice: remove detritus from generic_file_splice_read()
mm/filemap: don't allow partially uptodate page for pipes
aio: fix freeze protection of aio writes
fs: remove aio_run_iocb
fs: remove the never implemented aio_fsync file operation
aio: hold an extra file reference over AIO read/write operations
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions