From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Sep 2019 20:41:01 +0000 (-0700)
Subject: Merge tag 'filelock-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... 
X-Git-Tag: v5.4-rc1~127
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d013cc800a2a41b0496f99a11f3cff724cf65941;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'filelock-v5.4-1' of git://git./linux/kernel/git/jlayton/linux

Pull file locking updates from Jeff Layton:
 "Just a couple of minor bugfixes, a revision to a tracepoint to account
  for some earlier changes to the internals, and a patch to add a
  pr_warn message when someone tries to mount a filesystem with '-o
  mand' on a kernel that has that support disabled"

* tag 'filelock-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: fix a memory leak bug in __break_lease()
  locks: print a warning when mount fails due to lack of "mand" support
  locks: Fix procfs output for file leases
  locks: revise generic_add_lease tracepoint
---

d013cc800a2a41b0496f99a11f3cff724cf65941