From: Linus Torvalds Date: Wed, 4 Jun 2014 15:12:50 +0000 (-0700) Subject: Merge tag 'locks-v3.16' of git://git.samba.org/jlayton/linux into next X-Git-Tag: firefly_0821_release~176^2~3465^2~14 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=74efa045f4e2fdcc9d6384004c5b1bba0cc1fd3c;p=firefly-linux-kernel-4.4.55.git Merge tag 'locks-v3.16' of git://git.samba.org/jlayton/linux into next Pull file locking changes from Jeff Layton: "Pretty quiet on the file-locking related front this cycle. Just some small cleanups and the addition of some tracepoints in the lease handling code" * tag 'locks-v3.16' of git://git.samba.org/jlayton/linux: locks: add some tracepoints in the lease handling code fs/locks.c: replace seq_printf by seq_puts locks: ensure that fl_owner is always initialized properly in flock and lease codepaths --- 74efa045f4e2fdcc9d6384004c5b1bba0cc1fd3c