From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 May 2017 22:27:02 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v4.12-rc2~35
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1319a2856dfdd6b4613530e771fe108f00dfc661;p=linux-2.6-block.git

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()
---

1319a2856dfdd6b4613530e771fe108f00dfc661