Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[mv-sheeva.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 5e8e9d9ccb331ffe1a88c32f402a70eefca4ad18..3c4886b849f57e21d4fbde30fd7b633139165790 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -674,12 +674,6 @@ config ZISOFS
          necessary to create such a filesystem.  Say Y here if you want to be
          able to read such compressed CD-ROMs.
 
          necessary to create such a filesystem.  Say Y here if you want to be
          able to read such compressed CD-ROMs.
 

-config ZISOFS_FS
-# for fs/nls/Config.in
-       tristate
-       depends on ZISOFS
-       default ISO9660_FS
-

 config UDF_FS
        tristate "UDF file system support"
        help
 config UDF_FS
        tristate "UDF file system support"
        help


@@ -1094,7 +1088,7 @@ config AFFS_FS
 
 config ECRYPT_FS
        tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
 
 config ECRYPT_FS
        tristate "eCrypt filesystem layer support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && KEYS && CRYPTO
+       depends on EXPERIMENTAL && KEYS && CRYPTO && NET

        help
          Encrypted filesystem that operates on the VFS layer.  See
          <file:Documentation/ecryptfs.txt> to learn more about
        help
          Encrypted filesystem that operates on the VFS layer.  See
          <file:Documentation/ecryptfs.txt> to learn more about


@@ -1195,32 +1189,6 @@ config EFS_FS
          To compile the EFS file system support as a module, choose M here: the
          module will be called efs.
 
          To compile the EFS file system support as a module, choose M here: the
          module will be called efs.
 

-config JFFS_FS
-       tristate "Journalling Flash File System (JFFS) support"
-       depends on MTD && BLOCK && BROKEN
-       help
-         JFFS is the Journalling Flash File System developed by Axis
-         Communications in Sweden, aimed at providing a crash/powerdown-safe
-         file system for disk-less embedded devices. Further information is
-         available at (<http://developer.axis.com/software/jffs/>).
-
-         NOTE: This filesystem is deprecated and is scheduled for removal in
-         2.6.21.  See Documentation/feature-removal-schedule.txt
-
-config JFFS_FS_VERBOSE
-       int "JFFS debugging verbosity (0 = quiet, 3 = noisy)"
-       depends on JFFS_FS
-       default "0"
-       help
-         Determines the verbosity level of the JFFS debugging messages.
-
-config JFFS_PROC_FS
-       bool "JFFS stats available in /proc filesystem"
-       depends on JFFS_FS && PROC_FS
-       help
-         Enabling this option will cause statistics from mounted JFFS file systems
-         to be made available to the user in the /proc/fs/jffs/ directory.
-

 config JFFS2_FS
        tristate "Journalling Flash File System v2 (JFFS2) support"
        select CRC32
 config JFFS2_FS
        tristate "Journalling Flash File System v2 (JFFS2) support"
        select CRC32


@@ -1870,20 +1838,14 @@ config CIFS
          file servers such as Windows 2000 (including Windows 2003, NT 4  
          and Windows XP) as well by Samba (which provides excellent CIFS
          server support for Linux and many other operating systems). Limited
          file servers such as Windows 2000 (including Windows 2003, NT 4  
          and Windows XP) as well by Samba (which provides excellent CIFS
          server support for Linux and many other operating systems). Limited

-         support for Windows ME and similar servers is provided as well. 
-         You must use the smbfs client filesystem to access older SMB servers
-         such as OS/2 and DOS.
+         support for OS/2 and Windows ME and similar servers is provided as well.

 
          The intent of the cifs module is to provide an advanced
 
          The intent of the cifs module is to provide an advanced

-         network file system client for mounting to CIFS compliant servers, 
+         network file system client for mounting to CIFS compliant servers,

          including support for dfs (hierarchical name space), secure per-user
          session establishment, safe distributed caching (oplock), optional
          including support for dfs (hierarchical name space), secure per-user
          session establishment, safe distributed caching (oplock), optional

-         packet signing, Unicode and other internationalization improvements, 
-         and optional Winbind (nsswitch) integration. You do not need to enable
-         cifs if running only a (Samba) server. It is possible to enable both
-         smbfs and cifs (e.g. if you are using CIFS for accessing Windows 2003
-         and Samba 3 servers, and smbfs for accessing old servers). If you need 
-         to mount to Samba or Windows from this machine, say Y.
+         packet signing, Unicode and other internationalization improvements. 
+         If you need to mount to Samba or Windows from this machine, say Y.

 
 config CIFS_STATS
         bool "CIFS statistics"
 
 config CIFS_STATS
         bool "CIFS statistics"


@@ -1976,14 +1938,13 @@ config CIFS_EXPERIMENTAL
          depends on CIFS && EXPERIMENTAL
          help
            Enables cifs features under testing. These features are
          depends on CIFS && EXPERIMENTAL
          help
            Enables cifs features under testing. These features are

-           experimental and currently include support for writepages
-           (multipage writebehind performance improvements) and directory
-           change notification ie fcntl(F_DNOTIFY) as well as some security
-           improvements.  Some also depend on setting at runtime the
-           pseudo-file /proc/fs/cifs/Experimental (which is disabled by
-           default). See the file fs/cifs/README for more details.
-
-           If unsure, say N.
+           experimental and currently include DFS support and directory 
+           change notification ie fcntl(F_DNOTIFY), as well as the upcall
+           mechanism which will be used for Kerberos session negotiation
+           and uid remapping.  Some of these features also may depend on 
+           setting a value of 1 to the pseudo-file /proc/fs/cifs/Experimental
+           (which is disabled by default). See the file fs/cifs/README 
+           for more details.  If unsure, say N.

 
 config CIFS_UPCALL
          bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"
 
 config CIFS_UPCALL
          bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)"