Merge branch 'smp/for-block' into smp/hotplug