From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Mar 2019 17:06:29 +0000 (-0700)
Subject: Merge tag 'locks-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9798a22df3a8a976932838b6375c064fc9e623e1;p=openwrt%2Fstaging%2Fblogic.git

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

Pull file locking bugfix from Jeff Layton:
 "Just a single fix for a bug that crept into POSIX lock deadlock
  detection in v5.0"

* tag 'locks-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  locks: wake any locks blocked on request before deadlock check
---

9798a22df3a8a976932838b6375c064fc9e623e1