tree 81986a1e9ab1f0bdd8fe1563f03a666b5b5ff097
parent 049e6dde7e57f0054fdc49102e7ef4830c698b46
parent 616a5399b8f11a526cedcbaeb68bc0a1b08a3f43
author Linus Torvalds <torvalds@linux-foundation.org> 1444138221 +0100
committer Linus Torvalds <torvalds@linux-foundation.org> 1444138221 +0100

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "Two fixes for problems pointed out by automated tools.

  Thanks PaX/grsecurity team and Dan Carpenter (and the Smatch tool)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] Update cifs version number
  [SMB3] Do not fall back to SMBWriteX in set_file_size error cases
  [SMB3] Missing null tcon check