author | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 20 Feb 2014 20:00:27 +0000 (12:00 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Thu, 20 Feb 2014 20:00:27 +0000 (12:00 -0800) |
Pull workqueue fixes from Tejun Heo:
"Two workqueue fixes. One for an unlikely but possible critical bug
during kworker shutdown and the other to make lockdep names a bit more
descriptive"
* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: ensure @task is valid across kthread_stop()
workqueue: add args to workqueue lockdep name
"Two workqueue fixes. One for an unlikely but possible critical bug
during kworker shutdown and the other to make lockdep names a bit more
descriptive"
* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: ensure @task is valid across kthread_stop()
workqueue: add args to workqueue lockdep name
Trivial merge