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

2018-04-04 Thread Bjorn Helgaas
On Mon, Apr 2, 2018 at 9:15 PM Stephen Rothwell 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"

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

2018-04-02 Thread 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

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

2014-09-26 Thread Stephen Rothwell
Hi Liviu, On Fri, 26 Sep 2014 10:13:57 +0100 Liviu Dudau wrote: > > I agree with Thierry's solution. > > I don't know how these cases are handled. Should I send Bjorn a patch for his > tree? They need to be fixed in one or other of the trees, so yes. -- Cheers, Stephen Rothwell

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

2014-09-26 Thread Liviu Dudau
On Fri, Sep 26, 2014 at 08:00:23AM +0100, Thierry Reding wrote: > On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote: > > Hi Bjorn, > > > > Today's linux-next merge of the pci tree got a conflict in > > include/asm-generic/io.h between commit 4005bfe0aa45 > > ("asm-generic/io.h: Impl

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

2014-09-26 Thread Thierry Reding
On Fri, Sep 26, 2014 at 01:29:02PM +1000, Stephen Rothwell wrote: > Hi Bjorn, > > Today's linux-next merge of the pci tree got a conflict in > include/asm-generic/io.h between commit 4005bfe0aa45 > ("asm-generic/io.h: Implement generic {read,write}s*()") from the > asm-generic tree and commit 3aad

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

2014-09-25 Thread Stephen Rothwell
Hi Bjorn, Today's linux-next merge of the pci tree got a conflict in include/asm-generic/io.h between commit 4005bfe0aa45 ("asm-generic/io.h: Implement generic {read,write}s*()") from the asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP") from