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

Hi all, Today's linux-next merge of the pci tree got a conflict in: arch/powerpc/include/asm/Kbuild between commit: 265c3491c4bc ("powerpc: Add support for GENERIC_EARLY_IOREMAP") from the powerpc tree and commit: 356f42aff121 ("asm-generic: Make msi.h a mandatory include/asm header")

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

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

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

Hi Jesse, Today's linux-next merge of the pci tree got a conflict in arch/powerpc/platforms/iseries/pci.c between commit 8ee3e0d69623 (powerpc: Remove the main legacy iSerie platform code) from the powerpc tree and commit 673c97562489 (powerpc/PCI: replace pci_probe_only with pci_flags) from the

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

Hi Jesse, Today's linux-next merge of the pci tree got a conflict in arch/powerpc/kernel/pci_64.c between commit fbe65447197789a3c27755956f6a4c445089 (powerpc/pci: move pci_64.c device tree scanning code into pci-common.c) from the powerpc tree and commit