diff -Naur linux-2.5.24org/Documentation/filesystems/00-INDEX linux-2.5.24/Documentation/filesystems/00-INDEX
--- linux-2.5.24org/Documentation/filesystems/00-INDEX	Wed Jul  3 14:38:55 2002
+++ linux-2.5.24/Documentation/filesystems/00-INDEX	Wed Jul  3 14:40:09 2002
@@ -8,6 +8,8 @@
 	- info and mount options for the Amiga Fast File System.
 bfs.txt
 	- info for the SCO UnixWare Boot Filesystem (BFS).
+cifs.txt
+	- description of the CIFS filesystem
 coda.txt
 	- description of the CODA filesystem.
 cramfs.txt
diff -Naur linux-2.5.24org/Documentation/filesystems/cifs.txt linux-2.5.24/Documentation/filesystems/cifs.txt
--- linux-2.5.24org/Documentation/filesystems/cifs.txt	Wed Dec 31 18:00:00 1969
+++ linux-2.5.24/Documentation/filesystems/cifs.txt	Wed Jul  3 15:00:00 2002
@@ -0,0 +1,26 @@
+This module, cifs, is a filesystem that implements the SMB/CIFS protocol, which is the
+protocol used by Windows based operating systems (including Windows 2000 and its successors)
+as well as Samba, OS/2 and many others operating systems and network file server appliances.
+The Cifs VFS filesystem module is designed to work well with servers that implement the newer versions
+(dialects) of the SMB/CIFS protocol such as Samba, the program written by Andrew Tridgell
+that turns any Unix host into a file server for DOS or Windows clients, as well as Windows NT,
+Windows 2000 and its successors.  It is not designed to handle older smb servers well, those that
+implement older versions of the dialect (such as OS/2 or Windows 95), for this purpose use smbfs.  
+
+This module can support mounting without a mount helper program.  The mount syntax is:
+        mount //server_ip_address/share_name  /mnt -o user=username,password=your_password
+where "username", "your_password" and "server_ip_address" and "share_name" should be replaced
+with specific values (supplied by the user) e.g.  
+	mount //9.53.216.16/public /mnt -o user=jsmith,password=openup  
+
+This cifs implementation is designed to handle network caching (safely) as well as to implement locking,
+large file (64 bit access), distributed file system ("dfs") and other advanced protocol features. It
+also implements the SNIA standard for Unix extensions to CIFS (when communicating with servers such as
+Samba 2.2.3 or later which support it).
+
+For more information contact sfrench@us.ibm.com
+
+Cifs is an SMB client (or gateway). For more info on the SMB/CIFS protocol and Samba, including
+documentation, please go to http://www.samba.org/ and then on to your nearest mirror.  For more
+information about the cifs vfs, go to the project page at:
+	http://us1.samba.org/samba/Linux_CIFS_client.html
diff -Naur linux-2.5.24org/fs/Config.help linux-2.5.24/fs/Config.help
--- linux-2.5.24org/fs/Config.help	Wed Jul  3 14:39:16 2002
+++ linux-2.5.24/fs/Config.help	Wed Jul  3 14:40:09 2002
@@ -920,6 +920,33 @@
   module, say M here and read <file:Documentation/modules.txt>.  If
   unsure, say N.
 
+CIFS (Common Internet File System) support
+CONFIG_CIFS
+  This is the client VFS module for the Common Internet File System
+  (CIFS) protocol which is the successor to the Server Message Block 
+  (SMB) protocol, the native file sharing mechanism for most early
+  PC operating systems.  CIFS is fully supported by current network
+  file servers such as Windows 2000 (including Windows NT version 4 
+  and Windows XP) as well by Samba (which provides excellent CIFS
+  server support for Linux and many other operating systems).  For
+  production systems the smbfs module may be used instead of this
+  cifs module since smbfs is currently more stable and provides
+  support for older servers.  The intent of this module is to provide the
+  most advanced network file system function for CIFS compliant servers, 
+  including support for dfs (heirarchical name space), secure per-user
+  session establishment, safe distributed caching (oplock), optional
+  packet signing, Unicode and other internationalization improvements, and
+  optional Winbind (nsswitch) integration.  This module is in an early
+  development stage, so unless you are specifically interested in this
+  filesystem, just say N.
+
+CIFS Debugging
+CONFIG_CIFS_DEBUG
+  If you are experiencing any problems with the CIFS filesystem, say
+  Y here.  This will result in additional debugging messages to be
+  written to the system log.  Under normal circumstances, this
+  results in very little overhead.  
+
 CONFIG_SMB_FS
   SMB (Server Message Block) is the protocol Windows for Workgroups
   (WfW), Windows 95/98, Windows NT and OS/2 Lan Manager use to share
diff -Naur linux-2.5.24org/fs/Config.in linux-2.5.24/fs/Config.in
--- linux-2.5.24org/fs/Config.in	Wed Jul  3 14:39:16 2002
+++ linux-2.5.24/fs/Config.in	Wed Jul  3 14:40:09 2002
@@ -132,6 +132,8 @@
    fi
    define_tristate CONFIG_EXPORTFS $CONFIG_NFSD
 
+   dep_tristate 'CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)' CONFIG_CIFS $CONFIG_INET
+
    dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
    if [ "$CONFIG_SMB_FS" != "n" ]; then
       bool '  Use a default NLS' CONFIG_SMB_NLS_DEFAULT
diff -Naur linux-2.5.24org/fs/Makefile linux-2.5.24/fs/Makefile
--- linux-2.5.24org/fs/Makefile	Wed Jul  3 14:39:14 2002
+++ linux-2.5.24/fs/Makefile	Wed Jul  3 14:47:07 2002
@@ -66,6 +66,7 @@
 obj-$(CONFIG_NLS)		+= nls/
 obj-$(CONFIG_SYSV_FS)		+= sysv/
 obj-$(CONFIG_SMB_FS)		+= smbfs/
+obj-$(CONFIG_CIFS)             += cifs/
 obj-$(CONFIG_NCP_FS)		+= ncpfs/
 obj-$(CONFIG_HPFS_FS)		+= hpfs/
 obj-$(CONFIG_NTFS_FS)		+= ntfs/
diff -Naur linux-2.5.24org/fs/nls/Config.in linux-2.5.24/fs/nls/Config.in
--- linux-2.5.24org/fs/nls/Config.in	Wed Jul  3 14:39:11 2002
+++ linux-2.5.24/fs/nls/Config.in	Wed Jul  3 14:40:09 2002
@@ -12,7 +12,7 @@
 # msdos and Joliet want NLS
 if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \
 	-o "$CONFIG_NTFS_FS" != "n" -o "$CONFIG_NCPFS_NLS" = "y" \
-	-o "$CONFIG_SMB_NLS" = "y" -o "$CONFIG_JFS_FS" != "n" ]; then
+	-o "$CONFIG_SMB_NLS" = "y" -o "$CONFIG_JFS_FS" != "n" -o "$CONFIG_CIFS" != "n"]; then
   define_bool CONFIG_NLS y
 else
   define_bool CONFIG_NLS n
diff -Naur linux-2.5.24org/fs/cifs/Makefile linux-2.5.24/fs/cifs/Makefile
--- linux-2.5.24org/fs/cifs/Makefile	Wed Dec 31 18:00:00 1969
+++ linux-2.5.24/fs/cifs/Makefile	Sun Jul  7 22:14:12 2002
@@ -0,0 +1,8 @@
+#
+# Makefile for Linux CIFS VFS client 
+#
+obj-$(CONFIG_CIFS) += cifs.o
+
+cifs-objs := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o md4.o md5.o cifs_unicode.o nterr.o
+
+include $(TOPDIR)/Rules.make
