| commit | 4264bc13712b40be38d8fc01a37c34279a27e30d | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 6 Aug 2013 20:58:34 +0000 (6 13:58 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 6 Aug 2013 20:58:34 +0000 (6 13:58 -0700) | ||
| tree | 0d8c9ad3b085218f390b62480e79e2e83f2983ae | treesnapshot (tar.gz zip) |
| parent | 0fff1068720f52942058e597a8bb7b4487086b46 | commitdiff |
| parent | 2865a8fb44cc32420407362cbda80c10fa09c6b2 | commitdiff |
Merge branch 'for-3.11-fixes' of git://git./linux/kernel/git/tj/wq
Pull two workqueue fixes from Tejun Heo:
"A lockdep notation update so that nested work_on_cpu() invocations
don't lead to spurious lockdep warnings and fix for an unbound attr
bug which made what's shown in sysfs deviate from the actual ones.
Both patches have pretty limited scope"
* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: copy workqueue_attrs with all fields
workqueue: allow work_on_cpu() to be called recursively
Pull two workqueue fixes from Tejun Heo:
"A lockdep notation update so that nested work_on_cpu() invocations
don't lead to spurious lockdep warnings and fix for an unbound attr
bug which made what's shown in sysfs deviate from the actual ones.
Both patches have pretty limited scope"
* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
workqueue: copy workqueue_attrs with all fields
workqueue: allow work_on_cpu() to be called recursively
| kernel/workqueue.c | diff1 | diff2 | blobhistory |