From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jun 2014 02:40:30 +0000 (-1000)
Subject: Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux
X-Git-Tag: firefly_0821_release~176^2~3711
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2dfded821097be62dc7ba20d53a9c96d0de13134;p=firefly-linux-kernel-4.4.55.git

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

Pull file locking fixes from Jeff Layton:
 "File locking related bugfixes

  Nothing too earth-shattering here.  A fix for a potential regression
  due to a patch in pile #1, and the addition of a memory barrier to
  prevent a race condition between break_deleg and generic_add_lease"

* tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux:
  locks: set fl_owner for leases back to current->files
  locks: add missing memory barrier in break_deleg
---

2dfded821097be62dc7ba20d53a9c96d0de13134