diff options
author | Linus Torvalds | 2016-11-11 18:19:01 +0100 |
---|---|---|
committer | Linus Torvalds | 2016-11-11 18:19:01 +0100 |
commit | c5e4ca6da93f69939542385ca23d7ccebddc3f7d (patch) | |
tree | da01507b6d050f5ac9face51a7be904ed5cc18dd /sound/oss/sound_config.h | |
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 | kernel-qcow2-linux-c5e4ca6da93f69939542385ca23d7ccebddc3f7d.tar.gz kernel-qcow2-linux-c5e4ca6da93f69939542385ca23d7ccebddc3f7d.tar.xz kernel-qcow2-linux-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 'sound/oss/sound_config.h')
0 files changed, 0 insertions, 0 deletions