diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 21:56:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 21:56:50 -0700 |
| commit | 575b94386bd539a7d803aee9fd4a8d275844c40f (patch) | |
| tree | ef5390206b64cf724a1485cfa3566ae20e4b73d2 /fs/sysv/inode.c | |
| parent | 4591343e3560d51fa37a24cd262192a7b889a6a3 (diff) | |
| parent | da33a871ba178dbe81da7d755818d3c2088cae32 (diff) | |
| download | linux-575b94386bd539a7d803aee9fd4a8d275844c40f.tar.bz2 | |
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 'fs/sysv/inode.c')
0 files changed, 0 insertions, 0 deletions