Merge branches 'pci/enumeration' and 'pci/misc' into next