Merge branch 'topic/pci-rescan-prep-v2' into for-next