diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-15 15:27:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-15 15:27:02 -0700 |
| commit | 1319a2856dfdd6b4613530e771fe108f00dfc661 (patch) | |
| tree | 47f4895266cc68cc9fbc8ab596cbecca387d26a8 /net/dccp/ipv6.c | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
| parent | 67b4c889cc835a2a6e2ff4e20544a33e37e2875d (diff) | |
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 'net/dccp/ipv6.c')
0 files changed, 0 insertions, 0 deletions