From: Linus Torvalds Date: Mon, 4 Jun 2018 20:05:02 +0000 (-0700) Subject: Merge tag 'locks-v4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9214407d1237a985894894f9be2b1a7416b69d14;p=openwrt%2Fstaging%2Fblogic.git 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() --- 9214407d1237a985894894f9be2b1a7416b69d14