linux-next: manual merge of the pci tree with the powerpc tree

Hi Bjorn, Today's linux-next merge of the pci tree got a conflict in: arch/powerpc/platforms/powernv/eeh-powernv.c between commit: 64ba3dc7bf7c ("powerpc/eeh: Update VF config space after EEH") from the powerpc tree and commit: fdabc3fe9982 ("PCI: Add #defines for Completion Timeout Dis

linux-next: manual merge of the pci tree with the powerpc tree

Hi Bjorn, Today's linux-next merge of the pci tree got a conflict in: include/linux/pci.h between commit: 856e1eb9bdd4 ("PCI/AER: Add uevents in AER and EEH error/resume") from the powerpc tree and commit: 0aa0f5d1084c ("PCI: Clean up whitespace in linux/pci.h, pci/pci.h") from the pci