Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

diff --cc fs/Kconfig
index 522469a,31cce5d..5f62e7e
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -258,16 -497,25 +258,35 @@@ config OCFS2_DEBUG_F
          this option for debugging only as it is likely to decrease
          performance of the filesystem.
  
 +config OCFS2_COMPAT_JBD
 +      bool "Use JBD for compatibility"
 +      depends on OCFS2_FS
 +      default n
 +      select JBD
 +      help
 +        The ocfs2 filesystem now uses JBD2 for its journalling.  JBD2
 +        is backwards compatible with JBD.  It is safe to say N here.
 +        However, if you really want to use the original JBD, say Y here.
 +
+ config BTRFS_FS
+       tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
+       depends on EXPERIMENTAL
+       select LIBCRC32C
+       select ZLIB_INFLATE
+       select ZLIB_DEFLATE
+       help
+         Btrfs is a new filesystem with extents, writable snapshotting,
+         support for multiple devices and many more features.
+ 
+         Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET
+         FINALIZED.  You should say N here unless you are interested in
+         testing Btrfs with non-critical data.
+ 
+         To compile this file system support as a module, choose M here. The
+         module will be called btrfs.
+ 
+         If unsure, say N.
+ 
  endif # BLOCK
  
  config DNOTIFY

diff --cc fs/Makefile
Simple merge