Re: linux-next: manual merge of the pci tree with the asm-generic tree

[Bjorn Helgaas]

On Mon, Apr 2, 2018 at 9:15 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
wrote:

> Hi all,

> Today's linux-next merge of the pci tree got a conflict in:

>     arch/cris/arch-v32/drivers/pci/bios.c

> between commits:

>     c690eddc2f3b ("CRIS: Drop support for the CRIS port")
>     fd8773f9f544 ("arch: remove frv port")
>     739d875dd698 ("mn10300: Remove the architecture")

> from the asm-generic tree and commit:

>     31cbca85df15 ("PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled")

> from the pci tree.

FWIW, I dropped the cris, frv, and mn10300 parts from my patch
(31cbca85df15).