diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 22:43:26 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 22:43:26 +0200 |
commit | 066dea8c30ae7d8e061145bcf5422ce0773582eb (patch) | |
tree | 2de9df544b2961bb5a6690978908e7749c7f19c0 /fs/nls/Makefile | |
parent | Merge tag 'dlm-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teiglan... (diff) | |
parent | locks: restore a warn for leaked locks on close (diff) | |
download | linux-066dea8c30ae7d8e061145bcf5422ce0773582eb.tar.xz linux-066dea8c30ae7d8e061145bcf5422ce0773582eb.zip |
Merge tag 'locks-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"This pile just has a few file locking fixes from Ben Coddington. There
are a couple of cleanup patches + an attempt to bring sanity to the
l_pid value that is reported back to userland on an F_GETLK request.
After a few gyrations, he came up with a way for filesystems to
communicate to the VFS layer code whether the pid should be translated
according to the namespace or presented as-is to userland"
* tag 'locks-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
locks: restore a warn for leaked locks on close
fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks
fs/locks: Use allocation rather than the stack in fcntl_getlk()
Diffstat (limited to 'fs/nls/Makefile')
0 files changed, 0 insertions, 0 deletions