Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] CIFS_DEBUG2 depends on CIFS

diff --combined fs/Kconfig
index 53f5c6d,7db0574..3f00a9f
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -326,7 -326,7 +326,7 @@@ source "fs/xfs/Kconfig
  
  config OCFS2_FS
        tristate "OCFS2 file system support (EXPERIMENTAL)"
 -      depends on NET && EXPERIMENTAL
 +      depends on NET && SYSFS && EXPERIMENTAL
        select CONFIGFS_FS
        select JBD
        select CRC32
@@@ -356,16 -356,6 +356,16 @@@
                  - POSIX ACLs
                  - readpages / writepages (not user visible)
  
 +config OCFS2_DEBUG_MASKLOG
 +      bool "OCFS2 logging support"
 +      depends on OCFS2_FS
 +      default y
 +      help
 +        The ocfs2 filesystem has an extensive logging system.  The system
 +        allows selection of events to log via files in /sys/o2cb/logmask/.
 +        This option will enlarge your kernel, but it allows debugging of
 +        ocfs2 filesystem issues.
 +
  config MINIX_FS
        tristate "Minix fs support"
        help
@@@ -1126,7 -1116,7 +1126,7 @@@ config JFFS2_SUMMAR
  
  config JFFS2_FS_XATTR
        bool "JFFS2 XATTR support (EXPERIMENTAL)"
 -      depends on JFFS2_FS && EXPERIMENTAL && !JFFS2_FS_WRITEBUFFER
 +      depends on JFFS2_FS && EXPERIMENTAL
        default n
        help
          Extended attributes are name:value pairs associated with inodes by
@@@ -1801,6 -1791,7 +1801,7 @@@ config CIFS_POSI
  
  config CIFS_DEBUG2
        bool "Enable additional CIFS debugging routines"
+       depends on CIFS
        help
           Enabling this option adds a few more debugging routines
           to the cifs code which slightly increases the size of