Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-fscache

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-fscache: (41 commits)
  NFS: Add mount options to enable local caching on NFS
  NFS: Display local caching state
  NFS: Store pages from an NFS inode into a local cache
  NFS: Read pages from FS-Cache into an NFS inode
  NFS: nfs_readpage_async() needs to be accessible as a fallback for local caching
  NFS: Add read context retention for FS-Cache to call back with
  NFS: FS-Cache page management
  NFS: Add some new I/O counters for FS-Cache doing things for NFS
  NFS: Invalidate FsCache page flags when cache removed
  NFS: Use local disk inode cache
  NFS: Define and create inode-level cache objects
  NFS: Define and create superblock-level objects
  NFS: Define and create server-level objects
  NFS: Register NFS for caching and retrieve the top-level index
  NFS: Permit local filesystem caching to be enabled for NFS
  NFS: Add FS-Cache option bit and debug bit
  NFS: Add comment banners to some NFS functions
  FS-Cache: Make kAFS use FS-Cache
  CacheFiles: A cache that backs onto a mounted filesystem
  CacheFiles: Export things for CacheFiles
  ...

diff --combined fs/Kconfig
index ae3b34a2ea6922cb9406f7483f8275c49ead0bc6,c0022b1d587775539446dc38d392daa05df8ae95..86b203fc3c56af2b41e0118dd3cc3bddd8a002d4
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -66,6 -66,13 +66,13 @@@ config GENERIC_AC
        bool
        select FS_POSIX_ACL
  
+ menu "Caches"
+ 
+ source "fs/fscache/Kconfig"
+ source "fs/cachefiles/Kconfig"
+ 
+ endmenu
+ 
  if BLOCK
  menu "CD-ROM/DVD Filesystems"
  
@@@ -169,8 -176,6 +176,8 @@@ source "fs/romfs/Kconfig
  source "fs/sysv/Kconfig"
  source "fs/ufs/Kconfig"
  
 +source "fs/exofs/Kconfig"
 +
  endif # MISC_FILESYSTEMS
  
  menuconfig NETWORK_FILESYSTEMS

diff --combined fs/Makefile
index 15f73014a208ce6f47dbc9c3ff3f2990cd2bcd5a,055d5237b10970af2197ace9f5f02d2c6abb985b..70b2aed87133328997e0754737f7ea49a499b21b
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -63,6 -63,7 +63,7 @@@ obj-$(CONFIG_PROFILING)               += dcookies.
  obj-$(CONFIG_DLM)             += dlm/
   
  # Do not add any filesystems before this line
+ obj-$(CONFIG_FSCACHE)         += fscache/
  obj-$(CONFIG_REISERFS_FS)     += reiserfs/
  obj-$(CONFIG_EXT3_FS)         += ext3/ # Before ext2 so root fs can be ext3
  obj-$(CONFIG_EXT2_FS)         += ext2/
@@@ -116,8 -117,8 +117,9 @@@ obj-$(CONFIG_AFS_FS)               += afs
  obj-$(CONFIG_BEFS_FS)         += befs/
  obj-$(CONFIG_HOSTFS)          += hostfs/
  obj-$(CONFIG_HPPFS)           += hppfs/
+ obj-$(CONFIG_CACHEFILES)      += cachefiles/
  obj-$(CONFIG_DEBUG_FS)                += debugfs/
  obj-$(CONFIG_OCFS2_FS)                += ocfs2/
  obj-$(CONFIG_BTRFS_FS)                += btrfs/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
 +obj-$(CONFIG_EXOFS_FS)          += exofs/