Subject: Re: linux-next: manual merge of the pci tree

From: Jesse Barnes <[email-masked]>
Date: Wed, 25 Jun 2008 12:28:19 -0700

On Tuesday, June 24, 2008 8:01 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> arch/x86/pci/pci.h between commit
> 547084aab406ea46c1b9bebb115dc86787720c11 ("x86: Move PCI IO ECS code to
> x86/pci") from the x86 tree and commit
> bb71ad880204b79d60331d3384103976e086cb9f ("PCI: boot parameter to avoid
> expansion ROM memory allocation") from the pci tree.
>
> Both commits wanted to use 0x40000 for a define (PCI_HAS_IO_ECS and
> PCI_NOASSIGN_ROMS).  I set PCI_NOASSIGN_ROMS to 0x80000.

Works for me, I can make that change in my linux-next tree if it helps.

Thanks,
Jesse