From: Jason Cooper <jason@lakedaemon•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Tejun Heo <tj@kernel•org>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org,
Simon Guinot <simon.guinot@sequanux•org>,
Kevin Hilman <khilman@linaro•org>
Subject: Re: linux-next: manual merge of the libata tree with the arm-soc tree
Date: Thu, 16 Jan 2014 07:26:29 -0500 [thread overview]
Message-ID: <20140116122629.GG29184@titan.lakedaemon.net> (raw)
In-Reply-To: <20140116114831.50261e22b6fb25aac2004b43@canb.auug.org.au>
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";
> };
>
prev parent reply other threads:[~2014-01-16 12:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-16 0:48 linux-next: manual merge of the libata tree with the arm-soc tree Stephen Rothwell
2014-01-16 12:26 ` Jason Cooper [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140116122629.GG29184@titan.lakedaemon.net \
--to=jason@lakedaemon$(echo .)net \
--cc=arnd@arndb$(echo .)de \
--cc=khilman@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=simon.guinot@sequanux$(echo .)org \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox