Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (864 commits)
  Btrfs: explicitly mark the tree log root for writeback
  Btrfs: Drop the hardware crc32c asm code
  Btrfs: Add Documentation/filesystem/btrfs.txt, remove old COPYING
  Btrfs: kmap_atomic(KM_USER0) is safe for btrfs_readpage_end_io_hook
  Btrfs: Don't use kmap_atomic(..., KM_IRQ0) during checksum verifies
  Btrfs: tree logging checksum fixes
  Btrfs: don't change file extent's ram_bytes in btrfs_drop_extents
  Btrfs: Use btrfs_join_transaction to avoid deadlocks during snapshot creation
  Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code
  Btrfs: drop EXPORT symbols from extent_io.c
  Btrfs: Fix checkpatch.pl warnings
  Btrfs: Fix free block discard calls down to the block layer
  Btrfs: avoid orphan inode caused by log replay
  Btrfs: avoid potential super block corruption
  Btrfs: do not call kfree if kmalloc failed in btrfs_sysfs_add_super
  Btrfs: fix a memory leak in btrfs_get_sb
  Btrfs: Fix typo in clear_state_cb
  Btrfs: Fix memset length in btrfs_file_write
  Btrfs: update directory's size when creating subvol/snapshot
  Btrfs: add permission checks to the ioctls
  ...

diff --cc fs/Kconfig
index 32883589ee54d6a741774b5e96dc703ad3dc4411,5f62e7e0e6cb816023734efa27f07a5e9d547396..02cff86af1b4fac046dee991217e131a99cb8336
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -260,18 -258,75 +260,37 @@@ 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"
 +config OCFS2_FS_POSIX_ACL
 +      bool "OCFS2 POSIX Access Control Lists"
        depends on OCFS2_FS
 +      select FS_POSIX_ACL
        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.
 +        Posix Access Control Lists (ACLs) support permissions for users and
 +        groups beyond the owner/group/world scheme.
  
+ 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
 -      bool "Dnotify support"
 -      default y
 -      help
 -        Dnotify is a directory-based per-fd file change notification system
 -        that uses signals to communicate events to user-space.  There exist
 -        superior alternatives, but some applications may still rely on
 -        dnotify.
 -
 -        If unsure, say Y.
 -
 -config INOTIFY
 -      bool "Inotify file change notification support"
 -      default y
 -      ---help---
 -        Say Y here to enable inotify support.  Inotify is a file change
 -        notification system and a replacement for dnotify.  Inotify fixes
 -        numerous shortcomings in dnotify and introduces several new features
 -        including multiple file events, one-shot support, and unmount
 -        notification.
 -
 -        For more information, see <file:Documentation/filesystems/inotify.txt>
 -
 -        If unsure, say Y.
 -
 -config INOTIFY_USER
 -      bool "Inotify support for userspace"
 -      depends on INOTIFY
 -      default y
 -      ---help---
 -        Say Y here to enable inotify support for userspace, including the
 -        associated system calls.  Inotify allows monitoring of both files and
 -        directories via a single open fd.  Events are read from the file
 -        descriptor, which is also select()- and poll()-able.
 -
 -        For more information, see <file:Documentation/filesystems/inotify.txt>
 -
 -        If unsure, say Y.
 +source "fs/notify/Kconfig"
  
  config QUOTA
        bool "Quota support"

diff --cc fs/Makefile
Simple merge