From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Sep 2017 20:43:26 +0000 (-0700)
Subject: Merge tag 'locks-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... 
X-Git-Tag: v4.14-rc1~132
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=066dea8c30ae7d8e061145bcf5422ce0773582eb;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'locks-v4.14-1' of git://git./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()
---

066dea8c30ae7d8e061145bcf5422ce0773582eb