diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 20:50:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 20:50:16 -0700 |
| commit | a5c984cc2986c3ed88615fec01e433f9019ff011 (patch) | |
| tree | 9911257830499e79c76b01770ff3164d9f065b13 /fs/proc_namespace.c | |
| parent | 95167aad6761ec8a0fc76506ed00439483208ee1 (diff) | |
| parent | ffe67b58595eda992f369de7ac4d0a9b165074fd (diff) | |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"Small set of cifs fixes. Most important is Jeff's fix that works
around disconnection problems which can be caused by simultaneous use
of user space tools (starting a long running smbclient backup then
doing a cifs kernel mount) or multiple cifs mounts through a NAT, and
Jim's fix to deal with reexport of cifs share.
I expect to send two more cifs fixes next week (being tested now) -
fixes to address an SMB2 unmount hang when server dies and a fix for
cifs symlink handling of Windows "NFS" symlinks"
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
[CIFS] update cifs.ko version
[CIFS] Remove ext2 flags that have been moved to fs.h
[CIFS] Provide sane values for nlink
cifs: stop trying to use virtual circuits
CIFS: FS-Cache: Uncache unread pages in cifs_readpages() before freeing them
Diffstat (limited to 'fs/proc_namespace.c')
0 files changed, 0 insertions, 0 deletions