From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 14 Aug 2018 04:56:50 +0000 (-0700)
Subject: Merge tag 'locks-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... 
X-Git-Tag: v4.19~450
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=575b94386bd539a7d803aee9fd4a8d275844c40f;p=platform%2Fkernel%2Flinux-rpi.git

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

575b94386bd539a7d803aee9fd4a8d275844c40f