From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Feb 2014 21:50:11 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.14-rc4~35
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=351a7934c0e788262f83380188f18e575f6bc63f;p=~emulex%2Finfiniband.git

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

Pull CIFS fixes from Steve French:
 "Three cifs fixes, the most important fixing the problem with passing
  bogus pointers with writev (CVE-2014-0069).

  Two additional cifs fixes are still in review (including the fix for
  an append problem which Al also discovered)"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix too big maxBuf size for SMB3 mounts
  cifs: ensure that uncached writes handle unmapped areas correctly
  [CIFS] Fix cifsacl mounts over smb2 to not call cifs
---

351a7934c0e788262f83380188f18e575f6bc63f