* linux-next: manual merge of the pci tree with the mips tree
@ 2012-02-27 0:31 Stephen Rothwell
2012-02-27 23:15 ` Bjorn Helgaas
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-02-27 0:31 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-next, linux-kernel, Bjorn Helgaas, Ralf Baechle
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the pci tree with the mips tree
2012-02-27 0:31 linux-next: manual merge of the pci tree with the mips tree Stephen Rothwell
@ 2012-02-27 23:15 ` Bjorn Helgaas
0 siblings, 0 replies; 3+ messages in thread
From: Bjorn Helgaas @ 2012-02-27 23:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jesse Barnes, linux-next, linux-kernel, Ralf Baechle
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the pci tree with the mips tree
@ 2015-01-28 0:10 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2015-01-28 0:10 UTC (permalink / raw)
To: Bjorn Helgaas, Ralf Baechle; +Cc: linux-next, linux-kernel, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi Bjorn,
Today's linux-next merge of the pci tree got conflicts in
arch/mips/pci/pci-bcm1480.c, arch/mips/pci/pci-octeon.c and
arch/mips/pci/pcie-octeon.c between commit 7b09777c187d ("MIPS: Add
struct pci_ops member names to initialization") from the mips tree and
commit ab1d7f9646fe ("MIPS: PCI: Add struct pci_ops member names to
initialization") from the pci tree.
I fixed it up (same patch, different white space - I used the ones from
the mips tree) and can carry the fix as necessary (no action is
required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-28 0:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-27 0:31 linux-next: manual merge of the pci tree with the mips tree Stephen Rothwell
2012-02-27 23:15 ` Bjorn Helgaas
2015-01-28 0:10 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).