Merge branch 'smp/threadalloc' into smp/hotplug