diff options
| author | Linus Torvalds <[email protected]> | 2019-03-26 17:06:29 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-03-26 17:06:29 +0000 |
| commit | 9798a22df3a8a976932838b6375c064fc9e623e1 (patch) | |
| tree | e577d13f6e8c06c33b1dedd9d316124bf30d0bf2 /net/tipc/net.c | |
| parent | Revert "parport: daisy: use new parport device model" (diff) | |
| parent | locks: wake any locks blocked on request before deadlock check (diff) | |
| download | kernel-9798a22df3a8a976932838b6375c064fc9e623e1.tar.gz kernel-9798a22df3a8a976932838b6375c064fc9e623e1.zip | |
Merge tag 'locks-v5.1' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/tipc/net.c')
0 files changed, 0 insertions, 0 deletions