From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jul 2019 02:21:38 +0000 (-0700)
Subject: Merge tag 'locks-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... 
X-Git-Tag: v5.15~6005
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=988052f47adc5c3b0b004180b59bb3761d91b752;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'locks-v5.3-1' of git://git./linux/kernel/git/jlayton/linux

Pull file locking updates from Jeff Layton:
 "Just a couple of small lease-related patches this cycle.

  One from Ira to add a new tracepoint that fires during lease conflict
  checks, and another patch from Amir to reduce false positives when
  checking for lease conflicts"

* tag 'locks-v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: eliminate false positive conflicts for write lease
  locks: Add trace_leases_conflict
---

988052f47adc5c3b0b004180b59bb3761d91b752