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

Bring in the block hotplug states for consistency.