From: Linus Torvalds Date: Tue, 10 Jul 2007 20:51:06 +0000 (-0700) Subject: Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block X-Git-Tag: v2.6.23-rc1~1157 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=01370f0603f8435d415a19f7e62d1bab826c3589;p=linux-2.6-omap-h63xx.git Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block * 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block: pipe: add documentation and comments pipe: change the ->pin() operation to ->confirm() Remove remnants of sendfile() xip sendfile removal splice: completely document external interface with kerneldoc sendfile: remove bad_sendfile() from bad_file_ops shmem: convert to using splice instead of sendfile() relay: use splice_to_pipe() instead of open-coding the pipe loop pipe: allow passing around of ops private pointer splice: divorce the splice structure/function definitions from the pipe header splice: relay support sendfile: convert nfsd to splice_direct_to_actor() sendfile: convert nfs to using splice_read() loop: convert to using splice_direct_to_actor() instead of sendfile() splice: add void cookie to the actor data sendfile: kill generic_file_sendfile() sendfile: remove .sendfile from filesystems that use generic_file_sendfile() sys_sendfile: switch to using ->splice_read, if available vmsplice: add vmsplice-to-user support splice: abstract out actor data --- 01370f0603f8435d415a19f7e62d1bab826c3589