remove some commits from mainline patches
that are conflicting with the hotplug driver