Merge branch 'pci/dead-code' into next