mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/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 commit is contained in:
commit
6c1423ba5d
1 changed files with 99 additions and 23 deletions
Loading…
Add table
Add a link
Reference in a new issue