[lkml]   [2018]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the pci tree with the asm-generic tree
On Mon, Apr 2, 2018 at 9:15 PM Stephen Rothwell <>

> 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

 \ /
  Last update: 2018-04-04 20:39    [W:0.026 / U:37.876 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site