diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 10:01:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-18 10:01:47 -0700 |
commit | 8908c94d6cd7513ba4512295abc945a6ff7f979c (patch) | |
tree | 5f987d0db14d301001621fd2085471a0c2331f8b /fs/cifs/cifsfs.h | |
parent | 0b7962a6c4a37ef3cbb25d976af7b9ec4ce8ad01 (diff) | |
parent | 897fba1172d637d344f009d700f7eb8a1fa262f1 (diff) | |
download | blackbird-op-linux-8908c94d6cd7513ba4512295abc945a6ff7f979c.tar.gz blackbird-op-linux-8908c94d6cd7513ba4512295abc945a6ff7f979c.zip |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs updates from Steve French:
"Various small CIFS and SMB3 fixes (including some for stable)"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
remove directory incorrectly tries to set delete on close on non-empty directories
Update cifs.ko version to 2.09
fs/cifs: correctly to anonymous authentication for the NTLM(v2) authentication
fs/cifs: correctly to anonymous authentication for the NTLM(v1) authentication
fs/cifs: correctly to anonymous authentication for the LANMAN authentication
fs/cifs: correctly to anonymous authentication via NTLMSSP
cifs: remove any preceding delimiter from prefix_path
cifs: Use file_dentry()
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 c1e749af749b..9dcf974acc47 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -134,5 +134,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); extern const struct export_operations cifs_export_ops; #endif /* CONFIG_CIFS_NFSD_EXPORT */ -#define CIFS_VERSION "2.08" +#define CIFS_VERSION "2.09" #endif /* _CIFSFS_H */ |