Messages in this thread | | | Date | Thu, 15 Aug 2013 15:31:48 +0200 | From | Thomas Petazzoni <> | Subject | Re: linux-next: manual merge of the mvebu tree with the pci tree |
| |
Dear Stephen Rothwell,
On Wed, 14 Aug 2013 16:18:40 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mvebu tree got a conflict in > drivers/pci/host/Kconfig between commit 5477a33b51b7 ("PCI: mvebu: Make > Marvell PCIe driver depend on OF") from the pci tree and commit > 31d896ade95d ("PCI: mvebu: add support for Marvell Dove SoCs") from the > mvebu tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Your fix seems correct to me.
Thanks,
Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
| |