diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 16:18:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 16:18:34 -0700 |
| commit | 56831a1a883bb8376ea56ce8f3b1d5844c94d257 (patch) | |
| tree | d4d23a8ffdc09fb644f111ed5a606640d31fe50a /fs/cifs/cifsfs.h | |
| parent | 6724cce8fb4b408ae1a2fab455050f3407c80144 (diff) | |
| parent | ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401 (diff) | |
| download | kernel_samsung_espresso10-56831a1a883bb8376ea56ce8f3b1d5844c94d257.zip kernel_samsung_espresso10-56831a1a883bb8376ea56ce8f3b1d5844c94d257.tar.gz kernel_samsung_espresso10-56831a1a883bb8376ea56ce8f3b1d5844c94d257.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] list entry can not return null
turn cifs_setattr into a multiplexor that calls the correct function
move file time and dos attribute setting logic into new function
spin off cifs_setattr with unix extensions to its own function
[CIFS] Code cleanup in old sessionsetup code
[CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dir
Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID arg
change CIFSSMBSetTimes to CIFSSMBSetPathInfo
[CIFS] fix trailing whitespace
bundle up Unix SET_PATH_INFO args into a struct and change name
Fix missing braces in cifs_revalidate()
remove locking around tcpSesAllocCount atomic variable
[CIFS] properly account for new user= field in SPNEGO upcall string allocation
[CIFS] remove level of indentation from decode_negTokenInit
[CIFS] cifs send2 not retrying enough in some cases on full socket
[CIFS] oid should also be checked against class in cifs asn
Diffstat (limited to 'fs/cifs/cifsfs.h')
| -rw-r--r-- | fs/cifs/cifsfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 25a6cbd..135c965 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -101,5 +101,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); extern const struct export_operations cifs_export_ops; #endif /* EXPERIMENTAL */ -#define CIFS_VERSION "1.53" +#define CIFS_VERSION "1.54" #endif /* _CIFSFS_H */ |