diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-21 19:01:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-21 19:01:17 +0200 |
| commit | 91962d0f79cb61776bfb97eb5ea912e49e809d6c (patch) | |
| tree | 23197019aa5c784b1b0e42be39245abc7f873c91 /fs/cifs/cifsfs.h | |
| parent | iommu/amd: fix a crash in iova_magazine_free_pfns (diff) | |
| parent | cifs: update internal module number (diff) | |
| download | linux-91962d0f79cb61776bfb97eb5ea912e49e809d6c.tar.xz linux-91962d0f79cb61776bfb97eb5ea912e49e809d6c.zip | |
Merge tag '5.3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Two fixes for stable, one that had dependency on earlier patch in this
merge window and can now go in, and a perf improvement in SMB3 open"
* tag '5.3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
cifs: update internal module number
cifs: flush before set-info if we have writeable handles
smb3: optimize open to not send query file internal info
cifs: copy_file_range needs to strip setuid bits and update timestamps
CIFS: fix deadlock in cached root handling
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 aea005703785..4b21a90015a9 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h @@ -152,5 +152,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.20" +#define CIFS_VERSION "2.21" #endif /* _CIFSFS_H */ |