summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-20 18:38:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-20 18:38:47 -0800
commit2bfe01eff4307409b95859e860261d0907149b61 (patch)
tree51fd41be8e8df6057c3dde1eafdaa476b9200bea /kernel
parentcab7076a185e1e27f6879325e4da762424c3f1c9 (diff)
parentae6f8dd4d0c87bfb72da9d9b56342adf53e69c31 (diff)
downloadlinux-2bfe01eff4307409b95859e860261d0907149b61.tar.gz
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 'kernel')
0 files changed, 0 insertions, 0 deletions