diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-19 20:23:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-19 20:23:39 +0100 |
| commit | a2c9c1c0352bb16564680dbd1af21bfe56b7f000 (patch) | |
| tree | 615ac3664378401bf8dfb00612d2c4e087015d0e /mm/cma.h | |
| parent | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... (diff) | |
| parent | workqueue: avoid hard lockups in show_workqueue_state() (diff) | |
| download | linux-a2c9c1c0352bb16564680dbd1af21bfe56b7f000.tar.xz linux-a2c9c1c0352bb16564680dbd1af21bfe56b7f000.zip | |
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()
Diffstat (limited to 'mm/cma.h')
0 files changed, 0 insertions, 0 deletions