Linus, Please pull from: rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git/HEAD This will update the following files: cifs/README | 4 +-- cifs/cifsproto.h | 2 - cifs/cifssmb.c | 56 +++++++++++++++++++++++++++---------------------------- cifs/dir.c | 3 +- cifs/inode.c | 24 ++++++++++++++--------- cifs/misc.c | 1 6 files changed, 49 insertions(+), 41 deletions(-) commit b1a45695bde0204597957e448923f09ce271ca80 tree 96e82946fffd1105741dc99c886d92753ddac0ee parent b2aeb9d565be5ef00fb9f921c6d2459c74d90cdf author Steve French Tue, 17 May 2005 16:07:23 -0500 committer Steve French Tue, 17 May 2005 16:07:23 -0500 [CIFS] fix casts of unicode strings to match function definition Signed-off-by: Steve French (sfrench@us.ibm.com) commit b2aeb9d565be5ef00fb9f921c6d2459c74d90cdf tree e7adab50ce6a13ef5ceb0fbb3d1208ae63523dc9 parent 67594feb4b68074d8807f5566536e06db9130679 author Steve French Tue, 17 May 2005 13:16:18 -0500 committer Steve French Tue, 17 May 2005 13:16:18 -0500 [CIFS] Fix oops in cifs_unlink. Caused in some cases when renaming over existing, newly created, file. Samba bugzilla: 2697 Signed-off-by: Steve French (sfrench@us.ibm.com) commit 67594feb4b68074d8807f5566536e06db9130679 tree 7360879062daf210285ab0a72be22eb26c2565e3 parent ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e author Steve French Tue, 17 May 2005 13:04:49 -0500 committer Steve French Tue, 17 May 2005 13:04:49 -0500 [CIFS] missing break needed to handle < when mount option "mapchars" specified Signed-off-by: Steve French (sfrench@us.ibm.com) The diff also is attached