| commit | 6c1423ba5dbdab45bcd8c1bc3bc6e07fe3f6a470 | |
| author | Tejun Heo <tj@kernel.org> | |
| Mon, 17 Sep 2012 23:07:34 +0000 (17 16:07 -0700) | ||
| committer | Tejun Heo <tj@kernel.org> | |
| Mon, 17 Sep 2012 23:09:09 +0000 (17 16:09 -0700) | ||
| tree | 3c7899ba9eee94f408faf483622faa23cbdbfed2 | treesnapshot (tar.gz zip) |
| parent | 136b5721d75a62a8f02c601c89122e32c1a85a84 | commitdiff |
| parent | 960bd11bf2daf669d0d910428fd9ef5a15c3d7cb | commitdiff |
Merge branch 'for-3.6-fixes' of git://git./linux/kernel/git/tj/wq into for-3.7
This merge is necessary as Lai's CPU hotplug restructuring series
depends on the CPU hotplug bug fixes in for-3.6-fixes.
The merge creates one trivial conflict between the following two
commits.
96e65306b8 "workqueue: UNBOUND -> REBIND morphing in rebind_workers() should be atomic"
e2b6a6d570 "workqueue: use system_highpri_wq for highpri workers in rebind_workers()"
Both add local variable definitions to the same block and can be
merged in any order.
Signed-off-by: Tejun Heo <tj@kernel.org>
This merge is necessary as Lai's CPU hotplug restructuring series
depends on the CPU hotplug bug fixes in for-3.6-fixes.
The merge creates one trivial conflict between the following two
commits.
96e65306b8 "workqueue: UNBOUND -> REBIND morphing in rebind_workers() should be atomic"
e2b6a6d570 "workqueue: use system_highpri_wq for highpri workers in rebind_workers()"
Both add local variable definitions to the same block and can be
merged in any order.
Signed-off-by: Tejun Heo <tj@kernel.org>
| kernel/workqueue.c | diff1 | diff2 | blobhistory |