From: Linus Torvalds Date: Mon, 11 Jun 2007 18:31:05 +0000 (-0700) Subject: Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block X-Git-Tag: v2.6.22-rc5~56 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5212c555be332fc95982077e6cdc7bb6cb5fff5f;p=linux-2.6-omap-h63xx.git Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block * 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block: splice: __generic_file_splice_read: fix read/truncate race splice: __generic_file_splice_read: fix i_size_read() length checks splice: move balance_dirty_pages_ratelimited() outside of splice actor pipe: move pipe_inode_info structure decleration up before it's used splice: remove do_splice_direct() symbol export splice: move inode size check into generic_file_splice_read() --- 5212c555be332fc95982077e6cdc7bb6cb5fff5f