diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-16 00:27:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-16 00:27:02 +0200 |
commit | 1319a2856dfdd6b4613530e771fe108f00dfc661 (patch) | |
tree | 47f4895266cc68cc9fbc8ab596cbecca387d26a8 /drivers/net/hippi | |
parent | Linux 4.12-rc1 (diff) | |
parent | [CIFS] Minor cleanup of xattr query function (diff) | |
download | linux-1319a2856dfdd6b4613530e771fe108f00dfc661.tar.xz linux-1319a2856dfdd6b4613530e771fe108f00dfc661.zip |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"A set of minor cifs fixes"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
[CIFS] Minor cleanup of xattr query function
fs: cifs: transport: Use time_after for time comparison
SMB2: Fix share type handling
cifs: cifsacl: Use a temporary ops variable to reduce code length
Don't delay freeing mids when blocked on slow socket write of request
CIFS: silence lockdep splat in cifs_relock_file()
Diffstat (limited to 'drivers/net/hippi')
0 files changed, 0 insertions, 0 deletions