Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754352Ab2K0LXR (ORCPT ); Tue, 27 Nov 2012 06:23:17 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:36520 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753533Ab2K0LXQ (ORCPT ); Tue, 27 Nov 2012 06:23:16 -0500 Message-ID: <50B4A274.5070601@ti.com> Date: Tue, 27 Nov 2012 16:52:28 +0530 From: Mugunthan V N User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Stephen Rothwell CC: Olof Johansson , Arnd Bergmann , , , , Vaibhav Hiremath , David Miller , , AnilKumar Ch , Benoit Cousson , Jon Hunter , Afzal Mohammed , "Philip, Avinash" Subject: Re: linux-next: manual merge of the arm-soc tree with the net-next tree References: <20121126204546.ef1f1b55e903eda38a61d5d1@canb.auug.org.au> In-Reply-To: <20121126204546.ef1f1b55e903eda38a61d5d1@canb.auug.org.au> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 961 Lines: 26 On 11/26/2012 3:15 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/am33xx.dtsi between commit 1a39a65cba08 ("arm/dts: > am33xx: Add CPSW and MDIO module nodes for AM33XX") from the net-next > tree and commits 059b185d5345 ("ARM: dts: AM33XX: Add D_CAN device tree > data") and 4c94ac29b5c1 ("ARM: dts: OMAP: Move interrupt-parent to the > root node to avoid duplication") (and a few others that added more later > nodes) from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Stephen Rothwell The fix is correct and I have tested CPSW from linux-next. Regards Mugunthan V N -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/