Merge branch 'fix/pci-vdevice' into for-linus