summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve French2006-12-23 19:44:33 +0100
committerSteve French2006-12-23 19:44:33 +0100
commit405c514f95898452db728df6bc79f63e44a3f2d0 (patch)
treeae9e4604fdfe7a4a6cfaf4bb38d02dc9238e8a04
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff)
downloadkernel-qcow2-linux-405c514f95898452db728df6bc79f63e44a3f2d0.tar.gz
kernel-qcow2-linux-405c514f95898452db728df6bc79f63e44a3f2d0.tar.xz
kernel-qcow2-linux-405c514f95898452db728df6bc79f63e44a3f2d0.zip
[CIFS] Update CIFS version number
Signed-off-by: Steve French <sfrench@us.ibm.com>
-rw-r--r--fs/cifs/CHANGES4
-rw-r--r--fs/cifs/cifsfs.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 3539d6ef9611..d04d2f7448d9 100644
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -1,3 +1,7 @@
+Version 1.47
+------------
+Fix oops in list_del during mount caused by unaligned string.
+
Version 1.46
------------
Support deep tree mounts. Better support OS/2, Win9x (DOS) time stamps.
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index a243f779b363..8aa66dcf13bd 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -100,5 +100,5 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t);
extern ssize_t cifs_listxattr(struct dentry *, char *, size_t);
extern int cifs_ioctl (struct inode * inode, struct file * filep,
unsigned int command, unsigned long arg);
-#define CIFS_VERSION "1.46"
+#define CIFS_VERSION "1.47"
#endif /* _CIFSFS_H */