[lkml]   [2012]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the pci tree with the mips tree
On Sun, Feb 26, 2012 at 5:31 PM, Stephen Rothwell <> 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.


 \ /
  Last update: 2012-02-28 00:17    [W:0.026 / U:8.552 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site