From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: linux-next: manual merge of the arm-soc tree with the staging tree Date: Wed, 16 May 2012 10:54:15 +0000 Message-ID: <201205161054.15610.arnd@arndb.de> References: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Return-path: Received: from moutng.kundenserver.de ([212.227.126.171]:52247 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967019Ab2EPKyW (ORCPT ); Wed, 16 May 2012 06:54:22 -0400 In-Reply-To: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maxime Ripard , Greg KH , Jean-Christophe PLAGNIOL-VILLARD On Wednesday 16 May 2012, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/at91sam9g20.dtsi between commit 7cb2e629a240 ("ARM: > AT91: Add ADC driver to the at91sam9g20 dtsi") from the staging tree and > commit 5b6089cb6f28 ("ARM: at91: add at91sam9260 DT support") from the > arm-soc tree. > > So, I didn't know what to do with this, so I used the arm-soc version of > this file (effectively throwing away the staging tree change). Hints, > anyone? I suspect the addition of the adc node should just go into the at91sam9260.dtsi file. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Wed, 16 May 2012 10:54:15 +0000 Subject: linux-next: manual merge of the arm-soc tree with the staging tree In-Reply-To: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au> References: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au> Message-ID: <201205161054.15610.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wednesday 16 May 2012, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/boot/dts/at91sam9g20.dtsi between commit 7cb2e629a240 ("ARM: > AT91: Add ADC driver to the at91sam9g20 dtsi") from the staging tree and > commit 5b6089cb6f28 ("ARM: at91: add at91sam9260 DT support") from the > arm-soc tree. > > So, I didn't know what to do with this, so I used the arm-soc version of > this file (effectively throwing away the staging tree change). Hints, > anyone? I suspect the addition of the adc node should just go into the at91sam9260.dtsi file. Arnd