| commit | 35e274458c1d64dfcb725bb23a097c925dcd653d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 30 21:04:37 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 30 21:04:37 2014 -0700 |
| tree | b0d265bc448d5923b1221f46d130d44456032e93 | |
| parent | fd5984d7c8e8e249aca0c515817ab1e7dee1502c [diff] | |
| parent | e0b760ff71be168d4e623f7c3612e98902ab93e9 [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