path: root/scripts
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-18 10:21:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-18 10:21:47 -0800
commitb2b89ebfc0f0287e20516a5443d93af309b800cf (patch)
treed3c1e02fbc3ed33ebc00b88d6265a3cd2f5d1015 /scripts
parenteaa0eda56223815cd9dc1225f715ff673ae77198 (diff)
parent2e2f756f81edd7c3ba6ed384385ae1d6491652eb (diff)
Merge tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux
Pull file locking fixes from Jeff Layton: "A small set of patches to fix problems with the recent file locking changes that we discussed earlier this week" " * tag 'locks-v3.20-2' of git://git.samba.org/jlayton/linux: locks: fix list insertion when lock is split in two locks: remove conditional lock release in middle of flock_lock_file locks: only remove leases associated with the file being closed Revert "locks: keep a count of locks on the flctx lists"
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions