From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 Aug 2014 04:04:37 +0000 (-0700)
Subject: Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux
X-Git-Tag: v3.17-rc3~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=35e274458c1d64dfcb725bb23a097c925dcd653d;p=~emulex%2Finfiniband.git

Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux

Pull file locking bugfx from Jeff Layton:
 "Just a bugfix for a bug that crept in to v3.15.  It's in a rather rare
  error path, and I'm not aware of anyone having hit it, but it's worth
  fixing for v3.17"

* tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux:
  locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
---

35e274458c1d64dfcb725bb23a097c925dcd653d