diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 16:19:31 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-16 16:19:31 -0800 |
commit | 1213959d4ad2f523290d0d7c94f712edef63852c (patch) | |
tree | 530a5f546b52a5b6e459b8f42d823a3570eb390f /init/Kconfig | |
parent | 673fdfe3f0630b03f3854d0361b1232f2e5ef7fb (diff) | |
parent | 0cbaa53cdd33080c1e2d67ad9295b83c7954f2b3 (diff) | |
download | linux-1213959d4ad2f523290d0d7c94f712edef63852c.tar.gz linux-1213959d4ad2f523290d0d7c94f712edef63852c.tar.bz2 linux-1213959d4ad2f523290d0d7c94f712edef63852c.zip |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"A set of cifs fixes most important of which is Pavel's fix for some
problems with handling Windows reparse points and also the security
fix for setfacl over a cifs mount to Samba removing part of the ACL.
Both of these fixes are for stable as well.
Also added most of copychunk (copy offload) support to cifs although I
expect a final patch in that series (to fix handling of larger files)
in a few days (had to hold off on that in order to incorporate some
additional code review feedback).
Also added support for O_DIRECT on forcedirectio mounts (needed in
order to run some of the server benchmarks over cifs and smb2/smb3
mounts)"
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
[CIFS] Warn if SMB3 encryption required by server
setfacl removes part of ACL when setting POSIX ACLs to Samba
[CIFS] Set copychunk defaults
CIFS: SMB2/SMB3 Copy offload support (refcopy) phase 1
cifs: Use data structures to compute NTLMv2 response offsets
[CIFS] O_DIRECT opens should work on directio mounts
cifs: don't spam the logs on unexpected lookup errors
cifs: change ERRnomem error mapping from ENOMEM to EREMOTEIO
CIFS: Fix symbolic links usage
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions