Messages in this thread | | | From | Bjorn Helgaas <> | Date | Mon, 27 Feb 2012 16:15:20 -0700 | Subject | Re: linux-next: manual merge of the pci tree with the mips tree |
| |
On Sun, Feb 26, 2012 at 5:31 PM, Stephen Rothwell <sfr@canb.auug.org.au> 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
| |