From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Jan 2018 19:23:39 +0000 (-0800)
Subject: Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
X-Git-Tag: v5.15~9640
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2c9c1c0352bb16564680dbd1af21bfe56b7f000;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'for-4.15-fixes' of git://git./linux/kernel/git/tj/wq

Pull workqueue fixlet from Tejun Heo:
 "One patch to add touch_nmi_watchdog() while dumping workqueue debug
  messages to avoid triggering the lockup detector spuriously.

  The change is very low risk"

* 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: avoid hard lockups in show_workqueue_state()
---

a2c9c1c0352bb16564680dbd1af21bfe56b7f000