From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Subject: Re: linux-next: manual merge of the mvebu tree with the pci tree Date: Thu, 15 Aug 2013 15:31:48 +0200 Message-ID: <20130815153148.579ad2e5@skate> References: <20130814161840.dcee2b1354579cce7ff81730@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from top.free-electrons.com ([176.31.233.9]:42797 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756006Ab3HONb4 (ORCPT ); Thu, 15 Aug 2013 09:31:56 -0400 In-Reply-To: <20130814161840.dcee2b1354579cce7ff81730@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Jason Cooper , andrew@lunn.ch, gregory.clement@free-electrons.com, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas , Sebastian Hesselbarth 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