Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] vfs: add splice_write and splice_read to documentation
  [PATCH] Remove sys_ prefix of new syscalls from __NR_sys_*
  [PATCH] splice: warning fix
  [PATCH] another round of fs/pipe.c cleanups
  [PATCH] splice: comment styles
  [PATCH] splice: add Ingo as addition copyright holder
  [PATCH] splice: unlikely() optimizations
  [PATCH] splice: speedups and optimizations
  [PATCH] pipe.c/fifo.c code cleanups
  [PATCH] get rid of the PIPE_*() macros
  [PATCH] splice: speedup __generic_file_splice_read
  [PATCH] splice: add direct fd <-> fd splicing support
  [PATCH] splice: add optional input and output offsets
  [PATCH] introduce a "kernel-internal pipe object" abstraction
  [PATCH] splice: be smarter about calling do_page_cache_readahead()
  [PATCH] splice: optimize the splice buffer mapping
  [PATCH] splice: cleanup __generic_file_splice_read()
  [PATCH] splice: only call wake_up_interruptible() when we really have to
  [PATCH] splice: potential !page dereference
  [PATCH] splice: mark the io page as accessed

diff --cc include/asm-i386/unistd.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/linux/syscalls.h
index 89c4180,4c292fa..f001bad
--- 1/include/linux/syscalls.h
--- 2/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@@ -569,9 -569,12 +569,12 @@@ asmlinkage long compat_sys_newfstatat(u
  asmlinkage long compat_sys_openat(unsigned int dfd, const char __user *filename,
                                   int flags, int mode);
  asmlinkage long sys_unshare(unsigned long unshare_flags);
- asmlinkage long sys_splice(int fdin, int fdout, size_t len,
-                               unsigned int flags);
+ 
+ asmlinkage long sys_splice(int fd_in, loff_t __user *off_in,
+                          int fd_out, loff_t __user *off_out,
+                          size_t len, unsigned int flags);
+ 
  asmlinkage long sys_sync_file_range(int fd, loff_t offset, loff_t nbytes,
 -                                      int flags);
 +                                      unsigned int flags);
  
  #endif

diff --cc net/socket.c
Simple merge