diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-02 10:22:40 +1100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-02 10:22:40 +1100 |
| commit | 405b864d3fd579d3e8a1002f7452343fbb6dbe99 (patch) | |
| tree | d5e70f3c337fa20363cd090a7bb4d664d495b275 /fs/cifs/cifsfs.h | |
| parent | fdf4c587a793ba87935e38e7f25a9540bc9a7b95 (diff) | |
| parent | 6284644e8de1f4005166c918c3d2aa4c510ab9f6 (diff) | |
| download | talos-op-linux-405b864d3fd579d3e8a1002f7452343fbb6dbe99.tar.gz talos-op-linux-405b864d3fd579d3e8a1002f7452343fbb6dbe99.zip | |
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: fix length checks in checkSMB
[CIFS] Update cifs minor version
cifs: No need to check crypto blockcipher allocation
cifs: clean up some compiler warnings
cifs: make CIFS depend on CRYPTO_MD4
cifs: force a reconnect if there are too many MIDs in flight
cifs: don't pop a printk when sending on a socket is interrupted
cifs: simplify SMB header check routine
cifs: send an NT_CANCEL request when a process is signalled
cifs: handle cancelled requests better
cifs: fix two compiler warning about uninitialized vars
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 14789a97304e..4a3330235d55 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -127,5 +127,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.69" +#define CIFS_VERSION "1.70" #endif /* _CIFSFS_H */ |
