I split this up a bit and applied the first part to pci/error to get it into -next so we can start seeing what breaks. I won't be too surprised if we trip over something.