From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965872Ab2EPMs5 (ORCPT ); Wed, 16 May 2012 08:48:57 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:55909 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933389Ab2EPMsy (ORCPT ); Wed, 16 May 2012 08:48:54 -0400 X-Sasl-enc: Jwy6bEYqzCP+Lubb3E5emJjNadp5WgSkhsM0MKlGQDqe 1337172533 Date: Wed, 16 May 2012 05:48:51 -0700 From: Greg KH To: Arnd Bergmann Cc: Stephen Rothwell , Olof Johansson , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maxime Ripard , Jean-Christophe PLAGNIOL-VILLARD Subject: Re: linux-next: manual merge of the arm-soc tree with the staging tree Message-ID: <20120516124851.GA32064@kroah.com> References: <20120516185812.ce1ab57c3ec72445135a35fc@canb.auug.org.au> <201205161054.15610.arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201205161054.15610.arnd@arndb.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 16, 2012 at 10:54:15AM +0000, Arnd Bergmann wrote: > 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. So does that mean that the staging tree version is correct? Or that someone needs to send me a fixup patch here? confused, greg k-h