From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Feb 2015 18:21:47 +0000 (-0800)
Subject: Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux
X-Git-Tag: firefly_0821_release~176^2~2279
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b2b89ebfc0f0287e20516a5443d93af309b800cf;p=firefly-linux-kernel-4.4.55.git

Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux

Pull file locking fixes from Jeff Layton:
 "A small set of patches to fix problems with the recent file locking
  changes that we discussed earlier this week"
"

* tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux:
  locks: fix list insertion when lock is split in two
  locks: remove conditional lock release in middle of flock_lock_file
  locks: only remove leases associated with the file being closed
  Revert "locks: keep a count of locks on the flctx lists"
---

b2b89ebfc0f0287e20516a5443d93af309b800cf