diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 05:38:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-21 05:38:47 +0300 |
| commit | 2bfe01eff4307409b95859e860261d0907149b61 (patch) | |
| tree | 51fd41be8e8df6057c3dde1eafdaa476b9200bea /fs/notify | |
| parent | cab7076a185e1e27f6879325e4da762424c3f1c9 (diff) | |
| parent | ae6f8dd4d0c87bfb72da9d9b56342adf53e69c31 (diff) | |
| download | linux-2bfe01eff4307409b95859e860261d0907149b61.tar.xz | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS/SMB3 updates from Steve French:
"Includes support for a critical SMB3 security feature: per-share
encryption from Pavel, and a cleanup from Jean Delvare.
Will have another cifs/smb3 merge next week"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Allow to switch on encryption with seal mount option
CIFS: Add capability to decrypt big read responses
CIFS: Decrypt and process small encrypted packets
CIFS: Add copy into pages callback for a read operation
CIFS: Add mid handle callback
CIFS: Add transform header handling callbacks
CIFS: Encrypt SMB3 requests before sending
CIFS: Enable encryption during session setup phase
CIFS: Add capability to transform requests before sending
CIFS: Separate RFC1001 length processing for SMB2 read
CIFS: Separate SMB2 sync header processing
CIFS: Send RFC1001 length in a separate iov
CIFS: Make send_cancel take rqst as argument
CIFS: Make SendReceive2() takes resp iov
CIFS: Separate SMB2 header structure
CIFS: Fix splice read for non-cached files
cifs: Add soft dependencies
cifs: Only select the required crypto modules
cifs: Simplify SMB2 and SMB311 dependencies
Diffstat (limited to 'fs/notify')
0 files changed, 0 insertions, 0 deletions