diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-01 19:52:45 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-01 19:52:45 +0100 |
commit | 0f44bc36ba1cddbd34371110c4ef8f0800c8d465 (patch) | |
tree | ce5f664e91af8bc0988830acdacbba5080d9c5f3 /kernel/watchdog.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
parent | cifs: Fix check for regular file in couldbe_mf_symlink() (diff) | |
download | linux-0f44bc36ba1cddbd34371110c4ef8f0800c8d465.tar.xz linux-0f44bc36ba1cddbd34371110c4ef8f0800c8d465.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 (mostly for symlinks, and SMB2 xattrs) and
cleanups"
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Fix check for regular file in couldbe_mf_symlink()
[CIFS] Fix SMB2 mounts so they don't try to set or get xattrs via cifs
CIFS: Cleanup cifs open codepath
CIFS: Remove extra indentation in cifs_sfu_type
CIFS: Cleanup cifs_mknod
CIFS: Cleanup CIFSSMBOpen
cifs: Add support for follow_link on dfs shares under posix extensions
cifs: move unix extension call to cifs_query_symlink()
cifs: Re-order M-F Symlink code
cifs: Add create MFSymlinks to protocol ops struct
cifs: use protocol specific call for query_mf_symlink()
cifs: Rename MF symlink function names
cifs: Rename and cleanup open_query_close_cifs_symlink()
cifs: Fix memory leak in cifs_hardlink()
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions