]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 963d137 fbc7acf)
Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Aug 2014 04:04:37 +0000 (21:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Aug 2014 04:04:37 +0000 (21:04 -0700)
commit78a471d34d9dc593004112b33130de0714d6f6fc
treeb0d265bc448d5923b1221f46d130d44456032e93tree | snapshot
parent963d137a2207c6889075290a4af0fb8669caa4a8commit | diff
parentfbc7acfdeb94ae630f0da633d0ef778ea5ea7344commit | diff
Merge tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux

Pull file locking bugfx from Jeff Layton:
 "Just a bugfix for a bug that crept in to v3.15.  It's in a rather rare
  error path, and I'm not aware of anyone having hit it, but it's worth
  fixing for v3.17"

* tag 'locks-v3.17-3' of git://git.samba.org/jlayton/linux:
  locks: pass correct "before" pointer to locks_unlink_lock in generic_add_lease
Linux Kernel Source Tree.