projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77d9278 cf01f4e)
Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 May 2014 02:33:09 +0000 (11:33 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 May 2014 02:33:09 +0000 (11:33 +0900)
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


Trivial merge
John Crispins staging tree