OSDN Git Service

Merge tag 'locks-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Mar 2019 17:06:29 +0000 (10:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Mar 2019 17:06:29 +0000 (10:06 -0700)
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


Trivial merge