Merge remote-tracking branch 'pci/pri-changes' into x86/amd