From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Apr 2014 19:40:32 +0000 (-0700)
Subject: Merge tag 'locks-v3.15-2' of git://git.samba.org/jlayton/linux
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~10402
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=625bba662c17e917e164dc37f61aebbc49987ed6;p=mirror_ubuntu-artful-kernel.git

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

Pull file locking fixes from Jeff Layton:
 "File locking related bugfixes for v3.15 (pile #2)

   - fix for a long-standing bug in __break_lease that can cause soft
     lockups
   - renaming of file-private locks to "open file description" locks,
     and the command macros to more visually distinct names

  The fix for __break_lease is also in the pile of patches for which
  Bruce sent a pull request, but I assume that your merge procedure will
  handle that correctly.

  For the other patches, I don't like the fact that we need to rename
  this stuff at this late stage, but it should be settled now
  (hopefully)"

* tag 'locks-v3.15-2' of git://git.samba.org/jlayton/linux:
  locks: rename FL_FILE_PVT and IS_FILE_PVT to use "*_OFDLCK" instead
  locks: rename file-private locks to "open file description locks"
  locks: allow __break_lease to sleep even when break_time is 0
---

625bba662c17e917e164dc37f61aebbc49987ed6