Merge branch 'pci/error'