From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 May 2014 02:33:09 +0000 (+0900)
Subject: Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux
X-Git-Tag: firefly_0821_release~176^2~3915
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=14186fea0cb06bc43181ce239efe0df6f1af260a;p=firefly-linux-kernel-4.4.55.git

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

Pull file locking fix from Jeff Layton:
 "Fix for regression in handling of F_GETLK commands"

* tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux:
  locks: only validate the lock vs. f_mode in F_SETLK codepaths
---

14186fea0cb06bc43181ce239efe0df6f1af260a