From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Oct 2015 13:30:21 +0000 (+0100)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3c68319b28474055481824032e6730c28404116f;p=openwrt%2Fstaging%2Fblogic.git

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

3c68319b28474055481824032e6730c28404116f