Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  mm: export generic_pipe_buf_*() to modules
  fuse: support splice() reading from fuse device
  fuse: allow splice to move pages
  mm: export remove_from_page_cache() to modules
  mm: export lru_cache_add_*() to modules
  fuse: support splice() writing to fuse device
  fuse: get page reference for readpages
  fuse: use get_user_pages_fast()
  fuse: remove unneeded variable

diff --cc fs/fuse/dev.c
index e53df5ebb2b89904046e8a06808f68cd25fd6b5d,4413f5e7b13361f65aa8fd1333d56273d96623d4..9424796d6634f100a741d4f87c4a1c78608643a4
--- 1/fs/fuse/dev.c
--- 2/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@@ -16,9 -16,11 +16,12 @@@
  #include <linux/pagemap.h>
  #include <linux/file.h>
  #include <linux/slab.h>
+ #include <linux/pipe_fs_i.h>
+ #include <linux/swap.h>
+ #include <linux/splice.h>
  
  MODULE_ALIAS_MISCDEV(FUSE_MINOR);
 +MODULE_ALIAS("devname:fuse");
  
  static struct kmem_cache *fuse_req_cachep;
  

diff --cc fs/fuse/file.c
Simple merge

diff --cc fs/fuse/fuse_i.h
Simple merge

diff --cc fs/pipe.c
Simple merge

diff --cc mm/filemap.c
Simple merge