diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /fs/cifs/Kconfig | |
| parent | 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
Diffstat (limited to 'fs/cifs/Kconfig')
| -rw-r--r-- | fs/cifs/Kconfig | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/fs/cifs/Kconfig b/fs/cifs/Kconfig index 341a98965bd..6994a0f54f0 100644 --- a/fs/cifs/Kconfig +++ b/fs/cifs/Kconfig @@ -118,6 +118,18 @@ config CIFS_DEBUG2 option can be turned off unless you are debugging cifs problems. If unsure, say N. +config CIFS_DFS_UPCALL + bool "DFS feature support" + depends on CIFS && KEYS + help + Distributed File System (DFS) support is used to access shares + transparently in an enterprise name space, even if the share + moves to a different server. This feature also enables + an upcall mechanism for CIFS which contacts userspace helper + utilities to provide server name resolution (host names to + IP addresses) which is needed for implicit mounts of DFS junction + points. If unsure, say N. + config CIFS_EXPERIMENTAL bool "CIFS Experimental Features (EXPERIMENTAL)" depends on CIFS && EXPERIMENTAL @@ -131,12 +143,3 @@ config CIFS_EXPERIMENTAL (which is disabled by default). See the file fs/cifs/README for more details. If unsure, say N. -config CIFS_DFS_UPCALL - bool "DFS feature support (EXPERIMENTAL)" - depends on CIFS_EXPERIMENTAL - depends on KEYS - help - Enables an upcall mechanism for CIFS which contacts userspace - helper utilities to provide server name resolution (host names to - IP addresses) which is needed for implicit mounts of DFS junction - points. If unsure, say N. |