diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 03:40:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-14 03:40:36 +0300 |
| commit | f3996e6ac6e2bd739d8a82cc9acae0653c2d5dca (patch) | |
| tree | 2804b3df4d592ebe593b5b47dde58d80f9de79fa /fs/timerfd.c | |
| parent | e75cdf9898132f521df98a3ce1c280a2f85d360a (diff) | |
| parent | 7b52e2793a58af61b5d349c2c080437a437a4edb (diff) | |
| download | linux-f3996e6ac6e2bd739d8a82cc9acae0653c2d5dca.tar.xz | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull SMB3 updates from Steve French:
"A collection of SMB3 patches adding some reliability features
(persistent and resilient handles) and improving SMB3 copy offload.
I will have some additional patches for SMB3 encryption and SMB3.1.1
signing (important security features), and also for improving SMB3
persistent handle reconnection (setting ChannelSequence number e.g.)
that I am still working on but wanted to get this set in since they
can stand alone"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
Allow copy offload (CopyChunk) across shares
Add resilienthandles mount parm
[SMB3] Send durable handle v2 contexts when use of persistent handles required
[SMB3] Display persistenthandles in /proc/mounts for SMB3 shares if enabled
[SMB3] Enable checking for continuous availability and persistent handle support
[SMB3] Add parsing for new mount option controlling persistent handles
Allow duplicate extents in SMB3 not just SMB3.1.1
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions