summaryrefslogtreecommitdiff
path: root/fs/ecryptfs/miscdev.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 17:54:11 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 17:54:11 (GMT)
commit630103ea2c286de3e7ea9ae6b1035d91ef051413 (patch)
tree864fe60cc603434ddc16e7c0344a1a7f982d7b54 /fs/ecryptfs/miscdev.c
parent8783b6e2b2cb726f2734cf208d101f73ac1ba616 (diff)
parent1a500f010fb2d121c58f77ddfde2eca1bde3bfcd (diff)
downloadlinux-630103ea2c286de3e7ea9ae6b1035d91ef051413.tar.xz
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS update from Steve French: "Adds SMB2 rmdir/mkdir capability to the SMB2/SMB2.1 support in cifs. I am holding up a few more days on merging the remainder of the SMB2/SMB2.1 enablement although it is nearing review completion, in order to address some review comments from Jeff Layton on a few of the subsequent SMB2 patches, and also to debug an unrelated cifs problem that Pavel discovered." * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: CIFS: Add SMB2 support for rmdir CIFS: Move rmdir code to ops struct CIFS: Add SMB2 support for mkdir operation CIFS: Separate protocol specific part from mkdir CIFS: Simplify cifs_mkdir call
Diffstat (limited to 'fs/ecryptfs/miscdev.c')
0 files changed, 0 insertions, 0 deletions