msm_hotplug: merge latest version