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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem:
  xen: cleancache shim to Xen Transcendent Memory
  ocfs2: add cleancache support
  ext4: add cleancache support
  btrfs: add cleancache support
  ext3: add cleancache support
  mm/fs: add hooks to support cleancache
  mm: cleancache core ops functions and config
  fs: add field to superblock to support cleancache
  mm/fs: cleancache documentation

Fix up trivial conflict in fs/btrfs/extent_io.c due to includes

diff --cc drivers/xen/Makefile
Simple merge

diff --cc fs/btrfs/extent_io.c
index 96fcfa522dab72f837d991d5afaaacd4e73d8f74,0cee46e0108192e123b7a2d474d3bed66c3a9cbf..4f9893243dae26be226c3a72d09a966e36b645d1
--- 1/fs/btrfs/extent_io.c
--- 2/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -10,7 -10,7 +10,8 @@@
  #include <linux/swap.h>
  #include <linux/writeback.h>
  #include <linux/pagevec.h>
 +#include <linux/prefetch.h>
+ #include <linux/cleancache.h>
  #include "extent_io.h"
  #include "extent_map.h"
  #include "compat.h"

diff --cc fs/buffer.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/super.c
Simple merge

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

diff --cc mm/filemap.c
Simple merge