Merge branches 'master' and 'devel' into for-linus

[mirror_ubuntu-artful-kernel.git] / fs / cifs / Kconfig

diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig
index 5739fd7f88b4996698f6768f8aa9b955177d127a..917b7d449bb2a6248c28c23284cf82d9c032f285 100644 (file)
--- a/fs/cifs/Kconfig
+++ b/fs/cifs/Kconfig
@@ -2,7 +2,6 @@ config CIFS
        tristate "CIFS support (advanced network filesystem, SMBFS successor)"
        depends on INET
        select NLS
-       select SLOW_WORK
        help
          This is the client VFS module for the Common Internet File System
          (CIFS) protocol which is the successor to the Server Message Block
@@ -71,14 +70,14 @@ config CIFS_WEAK_PW_HASH
          If unsure, say N.
 
 config CIFS_UPCALL
-         bool "Kerberos/SPNEGO advanced session setup"
-         depends on CIFS && KEYS
-         help
-           Enables an upcall mechanism for CIFS which accesses
-           userspace helper utilities to provide SPNEGO packaged (RFC 4178)
-           Kerberos tickets which are needed to mount to certain secure servers
-           (for which more secure Kerberos authentication is required). If
-           unsure, say N.
+       bool "Kerberos/SPNEGO advanced session setup"
+       depends on CIFS && KEYS
+       select DNS_RESOLVER
+       help
+         Enables an upcall mechanism for CIFS which accesses userspace helper
+         utilities to provide SPNEGO packaged (RFC 4178) Kerberos tickets
+         which are needed to mount to certain secure servers (for which more
+         secure Kerberos authentication is required). If unsure, say N.
 
 config CIFS_XATTR
         bool "CIFS extended attributes"
@@ -122,6 +121,7 @@ config CIFS_DEBUG2
 config CIFS_DFS_UPCALL
          bool "DFS feature support"
          depends on CIFS && KEYS
+         select DNS_RESOLVER
          help
            Distributed File System (DFS) support is used to access shares
            transparently in an enterprise name space, even if the share