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] DFS build fixes
  [CIFS] DFS support: provide shrinkable mounts
  [CIFS] Do not log path names in lookup errors
  [CIFS] DFS support patchset: Added mountdata
  [CIFS] Forgot to add two new files from previous commit
  [CIFS] DNS name resolution helper upcall for cifs
  [CIFS] fix checkpatch warnings in fs/cifs/inode.c
  [CIFS] hold ses sem on tcp session reconnect during mount
  [CIFS] Allow setting mode via cifs acl
  [CIFS]  fix unicode string alignment in SPNEGO setup
  [CIFS] cifs_partialpagewrite() cleanup
  [CIFS]  use krb5 session key from first SMB session after a NegProt
  [CIFS] redo existing session setup if needed in cifs_mount
  [CIFS] Only dump SPNEGO key if CONFIG_CIFS_DEBUG2 is set
  [CIFS] fix SetEA failure to some Samba versions

diff --combined fs/Kconfig
index b6df18f1f677336091a5afdf1b2526c1163914f8,18cd2214946667080f5c2490a8cb1a92cf5a5e71..9656139d2e990ce8c11e6ed34a2b61182da332ff
--- 1/fs/Kconfig
--- 2/fs/Kconfig
+++ b/fs/Kconfig
@@@ -440,8 -440,14 +440,8 @@@ config OCFS2_F
          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"
@@@ -1022,8 -1028,8 +1022,8 @@@ config HUGETLB_PAG
        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
@@@ -1106,8 -1112,8 +1106,8 @@@ config HFS_F
        help
          If you say Y here, you will be able to mount Macintosh-formatted
          floppy disks and hard drive partitions with full read-write access.
 -        Please read <file:fs/hfs/HFS.txt> to learn about the available mount
 -        options.
 +        Please read <file:Documentation/filesystems/hfs.txt> to learn about
 +        the available mount options.
  
          To compile this file system support as a module, choose M here: the
          module will be called hfs.
@@@ -1899,13 -1905,15 +1899,15 @@@ config CIF
          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 OS/2 and Windows ME and similar servers is provided as well.
- 
-         The intent of the cifs module is to provide an advanced
-         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
-         packet signing, Unicode and other internationalization improvements. 
+         support for OS/2 and Windows ME and similar servers is provided as
+         well.
+ 
+         The cifs module provides an advanced network file system
+         client for mounting to CIFS compliant servers.  It includes
+         support for DFS (hierarchical name space), secure per-user
+         session establishment via Kerberos or NTLM or NTLMv2,
+         safe distributed caching (oplock), optional packet
+         signing, Unicode and other internationalization improvements.
          If you need to mount to Samba or Windows from this machine, say Y.
  
  config CIFS_STATS
@@@ -1937,7 -1945,8 +1939,8 @@@ config CIFS_WEAK_PW_HAS
          (since 1997) support stronger NTLM (and even NTLMv2 and Kerberos)
          security mechanisms. These hash the password more securely
          than the mechanisms used in the older LANMAN version of the
-           SMB protocol needed to establish sessions with old SMB servers.
+         SMB protocol but LANMAN based authentication is needed to
+         establish sessions with some old SMB servers.
  
          Enabling this option allows the cifs module to mount to older
          LANMAN based servers such as OS/2 and Windows 95, but such
@@@ -1945,8 -1954,8 +1948,8 @@@
          security mechanisms if you are on a public network.  Unless you
          have a need to access old SMB servers (and are on a private 
          network) you probably want to say N.  Even if this support
-         is enabled in the kernel build, they will not be used
-         automatically. At runtime LANMAN mounts are disabled but
+         is enabled in the kernel build, LANMAN authentication will not be
+         used automatically. At runtime LANMAN mounts are disabled but
          can be set to required (or optional) either in
          /proc/fs/cifs (see fs/cifs/README for more detail) or via an
          option on the mount command. This support is disabled by 
@@@ -2012,12 -2021,22 +2015,22 @@@ config CIFS_UPCAL
          depends on CIFS_EXPERIMENTAL
          depends on KEYS
          help
-           Enables an upcall mechanism for CIFS which will be used to contact
-           userspace helper utilities to provide SPNEGO packaged Kerberos
-           tickets which are needed to mount to certain secure servers
+           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_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.
+ 
  config NCP_FS
        tristate "NCP file system support (to mount NetWare volumes)"
        depends on IPX!=n || INET
@@@ -2124,3 -2143,4 +2137,3 @@@ source "fs/nls/Kconfig
  source "fs/dlm/Kconfig"
  
  endmenu
 -