[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAErSpo4r81nYtUNQ8_Wt1RGsCrWFJ4PAGSnRdpKV6vRNhkS9Lg@mail.gmail.com>
Date: Mon, 27 Feb 2012 16:15:20 -0700
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Jesse Barnes <jbarnes@...tuousgeek.org>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Ralf Baechle <ralf@...ux-mips.org>
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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists