Merge tag 'locks-v4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2018 20:05:02 +0000 (13:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jun 2018 20:05:02 +0000 (13:05 -0700)
commit9214407d1237a985894894f9be2b1a7416b69d14
tree394e3e94e5b0cae6ef5be922661008e478580de6
parenteeee3149aaa022145b2659e3b0601dc705d69402
parent7a107c0f55a3b4c6f84a4323df5610360bde1684
Merge tag 'locks-v4.18-1' of git://git./linux/kernel/git/jlayton/linux

Pull fasync fix from Jeff Layton:
 "Just a single fix for a deadlock in the fasync handling code that
  Kirill observed while testing.

  The fix is to change the fa_lock to be rwlock_t, and use a read lock
  in kill_fasync_rcu"

* tag 'locks-v4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
  fasync: Fix deadlock between task-context and interrupt-context kill_fasync()
include/linux/fs.h