Re: linux-next: manual merge of the pci tree with the mips tree
From: Bjorn Helgaas <bhelgaas@google.com>
Date: 2012-02-27 23:15:43
Also in:
lkml
On Sun, Feb 26, 2012 at 5:31 PM, Stephen Rothwell [off-list ref] wrote:
Hi Jesse,
Today's linux-next merge of the pci tree got a conflict in
arch/mips/pci/pci.c between commit f79eaeb10849 ("MIPS: PCI: use
list_for_each_entry() for bus->devices traversal") from the mips tree and
commit 96a6b9ad05a2 ("mips/PCI: get rid of device resource fixups") from
the pci tree.
The latter appears to supersede the former, so I used that.Sounds right to me. Thanks. Bjorn