Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (31 commits)
  ocfs2: clean up bh null checks
  ocfs2: document access rules for blocked_lock_list
  configfs: file.c fix possible recursive locking
  configfs: dir.c fix possible recursive locking
  configfs: Remove EXPERIMENTAL
  ocfs2: bump version number
  ocfs2/dlm: Clear joining_node on hearbeat node down
  ocfs2: convert byte order of constant instead of variable
  ocfs2: Update default cluster timeouts
  ocfs2: printf fixes
  ocfs2: Use generic_file_llseek
  ocfs2: Safer read_inline_data()
  ocfs2: Silence false lockdep warnings
  [PATCH 2/2] ocfs2: cluster aware flock()
  [PATCH 1/2] ocfs2: add flock lock type
  ocfs2: Local alloc window size changeable via mount option
  ocfs2: Support commit= mount option
  ocfs2: Add missing permission checks
  [PATCH 2/2] ocfs2: Implement group add for online resize
  [PATCH 1/2] ocfs2: Add group extend for online resize
  ...

1 files changed, 4 insertions, 10 deletions

diff --git a/fs/Kconfig b/fs/Kconfig
index b4799efaf9e8..b6df18f1f677 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -440,14 +440,8 @@ config OCFS2_FS
           Tools web page:      http://oss.oracle.com/projects/ocfs2-tools
           OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
 
-          Note: Features which OCFS2 does not support yet:
-                  - extended attributes
-                  - quotas
-                  - cluster aware flock
-                  - Directory change notification (F_NOTIFY)
-                  - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
-                  - POSIX ACLs
-                  - readpages / writepages (not user visible)
+          For more information on OCFS2, see the file
+          <file:Documentation/filesystems/ocfs2.txt>.
 
 config OCFS2_DEBUG_MASKLOG
         bool "OCFS2 logging support"
@@ -1028,8 +1022,8 @@ config HUGETLB_PAGE
         def_bool HUGETLBFS
 
 config CONFIGFS_FS
-        tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
-        depends on SYSFS && EXPERIMENTAL
+        tristate "Userspace-driven configuration filesystem"
+        depends on SYSFS
         help
           configfs is a ram-based filesystem that provides the converse
           of sysfs's functionality. Where sysfs is a filesystem-based