Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in drivers/pci/pci.c between commit 5f4fe7ad54087 ("PCI: Enable INTx in pci_reenable_device() only when MSI/MSI-X not enabled") from the pci-current tree and commit 1e2571a7813836 ("PCI: Enable INTx if BIOS left them disabled") from the pci tree.
I fixed it up resulting in the contents of pci-current and can carry the fix as necessary (no action is required).
Attachment:
pgpTon8jWegcL.pgp
Description: PGP signature
