From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Mar 2014 18:53:42 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.14-rc7~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33807f4f0daec3b00565c2932d95f614f5833adf;p=platform%2Fkernel%2Flinux-stable.git

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

Pull CIFS fixes from Steve French:
 "A fix for the problem which Al spotted in cifs_writev and a followup
  (noticed when fixing CVE-2014-0069) patch to ensure that cifs never
  sends more than the smb frame length over the socket (as we saw with
  that cifs_iovec_write problem that Jeff fixed last month)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: mask off top byte in get_rfc1002_length()
  cifs: sanity check length of data to send before sending
  CIFS: Fix wrong pos argument of cifs_find_lock_conflict
---

33807f4f0daec3b00565c2932d95f614f5833adf