Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Mar 2018 18:06:39 +0000 (10:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Mar 2018 18:06:39 +0000 (10:06 -0800)
commit7bec4a96466286b0ad00e6394bbb94c1b3fd98f3
tree4f5bc0db50aa0f790157446a944cfb6beba2b662
parent16453c9cf855d088d5598cedb75229e9056b12b3
parentc14376de3a1befa70d9811ca2872d47367b48767
Merge branch 'for-linus' of git://git./linux/kernel/git/pmladek/printk

Pull printk fix from Petr Mladek:
 "Make sure that we wake up userspace loggers. This fixes a race
  introduced by the console waiter logic during this merge window"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  printk: Wake klogd when passing console_lock owner
kernel/printk/printk.c