diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 06:56:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 06:56:50 +0200 |
| commit | 575b94386bd539a7d803aee9fd4a8d275844c40f (patch) | |
| tree | ef5390206b64cf724a1485cfa3566ae20e4b73d2 /.mailmap | |
| parent | Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | locks: remove misleading obsolete comment (diff) | |
| download | linux-575b94386bd539a7d803aee9fd4a8d275844c40f.tar.xz linux-575b94386bd539a7d803aee9fd4a8d275844c40f.zip | |
Merge tag 'locks-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"Just a couple of patches from Konstantin to fix /proc/locks when the
process that set the lock has exited, and a new tracepoint for the
flock() codepath. Also threw in mailmap entries for my addresses and a
comment cleanup"
* tag 'locks-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
locks: remove misleading obsolete comment
mailmap: remap some of my email addresses to kernel.org address
locks: add tracepoint in flock codepath
fs/lock: show locks taken by processes from another pidns
fs/lock: skip lock owner pid translation in case we are in init_pid_ns
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -81,6 +81,9 @@ Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com> <javier@osg.samsung.com> <javier.martinez@collabora.co.uk> Jean Tourrilhes <jt@hpl.hp.com> Jeff Garzik <jgarzik@pretzel.yyz.us> +Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com> +Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net> +Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com> Jens Axboe <axboe@suse.de> Jens Osterkamp <Jens.Osterkamp@de.ibm.com> Johan Hovold <johan@kernel.org> <jhovold@gmail.com> |