projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ec8765 62635ea)
Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Jan 2018 19:23:39 +0000 (11:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Jan 2018 19:23:39 +0000 (11:23 -0800)
commita2c9c1c0352bb16564680dbd1af21bfe56b7f000
tree615ac3664378401bf8dfb00612d2c4e087015d0etree | snapshot
parent6ec8765f55cc3e2d6543dfe64ebfd9b2ff327fa4commit | diff
parent62635ea8c18f0f62df4cc58379e4f1d33afd5801commit | diff
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()
John Crispins staging tree