| commit | a2c9c1c0352bb16564680dbd1af21bfe56b7f000 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 19 11:23:39 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 19 11:23:39 2018 -0800 |
| tree | 615ac3664378401bf8dfb00612d2c4e087015d0e | |
| parent | 6ec8765f55cc3e2d6543dfe64ebfd9b2ff327fa4 [diff] | |
| parent | 62635ea8c18f0f62df4cc58379e4f1d33afd5801 [diff] |
Merge branch 'for-4.15-fixes' of git://git.kernel.org/pub/scm/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()