From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752600AbaAPM0s (ORCPT ); Thu, 16 Jan 2014 07:26:48 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:16413 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488AbaAPM0p (ORCPT ); Thu, 16 Jan 2014 07:26:45 -0500 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+AX1Cww8IV1xqw0iIUBSn2279/gSOFc/0= X-DKIM: OpenDKIM Filter v2.0.1 titan 3EB5850BB9F Date: Thu, 16 Jan 2014 07:26:29 -0500 From: Jason Cooper To: Stephen Rothwell Cc: Tejun Heo , Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Simon Guinot , Kevin Hilman Subject: Re: linux-next: manual merge of the libata tree with the arm-soc tree Message-ID: <20140116122629.GG29184@titan.lakedaemon.net> References: <20140116114831.50261e22b6fb25aac2004b43@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140116114831.50261e22b6fb25aac2004b43@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen, Thanks, this looks good. Arnd, Olof, Kevin, This patch is in Tejun's tree because it is part of a patch series fixing SATA hotplug. That series is marked for stable. thx, Jason. On Thu, Jan 16, 2014 at 11:48:31AM +1100, Stephen Rothwell wrote: > Hi Tejun, > > Today's linux-next merge of the libata tree got a conflict in > arch/arm/boot/dts/armada-370-xp.dtsi between commit a095b1c78a35 ("ARM: > mvebu: sort DT nodes by address") from the arm-soc tree and commit > a96cc303e42a ("ARM: mvebu: update the SATA compatible string for Armada > 370/XP") from the libata tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc arch/arm/boot/dts/armada-370-xp.dtsi > index b6b253924893,df141a1d6448..000000000000 > --- a/arch/arm/boot/dts/armada-370-xp.dtsi > +++ b/arch/arm/boot/dts/armada-370-xp.dtsi > @@@ -236,12 -183,13 +236,12 @@@ > status = "disabled"; > }; > > - i2c0: i2c@11000 { > - compatible = "marvell,mv64xxx-i2c"; > - #address-cells = <1>; > - #size-cells = <0>; > - interrupts = <31>; > - timeout-ms = <1000>; > - clocks = <&coreclk 0>; > + sata@a0000 { > - compatible = "marvell,orion-sata"; > ++ compatible = "marvell,armada-370-sata"; > + reg = <0xa0000 0x5000>; > + interrupts = <55>; > + clocks = <&gateclk 15>, <&gateclk 30>; > + clock-names = "0", "1"; > status = "disabled"; > }; >