From: Gregory CLEMENT <gregory.clement@free-electrons.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Olof Johansson <olof@lixom.net>, Marcin Wojtas <mw@semihalf.com>
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree
Date: Tue, 15 Mar 2016 09:53:23 +0100 [thread overview]
Message-ID: <87k2l4yvek.fsf@free-electrons.com> (raw)
In-Reply-To: <20160315110713.49c4846e@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 15 Mar 2016 11:07:13 +1100")
Hi Stephen,
On mar., mars 15 2016, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm/boot/dts/armada-xp-db.dts
> arch/arm/boot/dts/armada-xp-gp.dts
> arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
>
> between commit:
>
> d7d5a43c0d16 ("ARM: mvebu: fix overlap of Crypto SRAM with PCIe memory window")
>
> from Linus' tree and commits:
>
> 9dd7a57e2cbf ("ARM: dts: armada-xp: enable buffer manager support on Armada XP boards")
> 293fdc24fcc9 ("ARM: dts: armada-xp-openblocks-ax3-4: Add BM support")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This fix is good, thanks!
Gregory
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm/boot/dts/armada-xp-db.dts
> index 45813a5526c8,30657302305d..000000000000
> --- a/arch/arm/boot/dts/armada-xp-db.dts
> +++ b/arch/arm/boot/dts/armada-xp-db.dts
> @@@ -76,8 -76,9 +76,9 @@@
> ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
> - MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
> + MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++ MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
>
> devbus-bootcs {
> status = "okay";
> @@@ -229,34 -242,10 +242,38 @@@
> spi-max-frequency = <20000000>;
> };
> };
> +
> + nand@d0000 {
> + status = "okay";
> + num-cs = <1>;
> + marvell,nand-keep-config;
> + marvell,nand-enable-arbiter;
> + nand-on-flash-bbt;
> +
> + partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition@0 {
> + label = "U-Boot";
> + reg = <0 0x800000>;
> + };
> + partition@800000 {
> + label = "Linux";
> + reg = <0x800000 0x800000>;
> + };
> + partition@1000000 {
> + label = "Filesystem";
> + reg = <0x1000000 0x3f000000>;
> +
> + };
> + };
> + };
> };
> +
> + bm-bppi {
> + status = "okay";
> + };
> };
> };
> diff --cc arch/arm/boot/dts/armada-xp-gp.dts
> index 5730b875c4f5,a1ded01d0c07..000000000000
> --- a/arch/arm/boot/dts/armada-xp-gp.dts
> +++ b/arch/arm/boot/dts/armada-xp-gp.dts
> @@@ -95,8 -95,9 +95,9 @@@
> ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
> - MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
> + MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++ MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
>
> devbus-bootcs {
> status = "okay";
> diff --cc arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> index 853bd392a4fe,3aa29a91c7b8..000000000000
> --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
> @@@ -65,9 -65,10 +65,10 @@@
> soc {
> ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> - MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000
> - MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
> + MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
> + MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
> - MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
> ++ MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
> + MBUS_ID(0x0c, 0x04) 0 0 0xd1200000 0x100000>;
>
> devbus-bootcs {
> status = "okay";
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2016-03-15 8:53 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 0:07 linux-next: manual merge of the net-next tree with Linus' tree Stephen Rothwell
2016-03-15 8:53 ` Gregory CLEMENT [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-14 23:52 Stephen Rothwell
2023-02-16 23:40 Stephen Rothwell
2023-02-16 23:18 Stephen Rothwell
2022-10-27 23:28 Stephen Rothwell
2022-10-28 6:53 ` Marc Kleine-Budde
2022-09-21 1:00 Stephen Rothwell
2022-09-21 4:40 ` Colin Foster
2022-07-15 2:01 Stephen Rothwell
2022-07-15 1:48 Stephen Rothwell
2021-07-23 2:32 Stephen Rothwell
2021-01-29 0:59 Stephen Rothwell
2021-01-29 0:48 Stephen Rothwell
2021-01-29 0:43 Stephen Rothwell
2019-10-21 0:07 Stephen Rothwell
2019-09-15 20:31 Mark Brown
2019-09-15 20:24 Mark Brown
2019-06-17 1:44 Stephen Rothwell
2019-06-04 0:30 Stephen Rothwell
2019-06-04 0:29 Stephen Rothwell
2019-04-02 22:56 Stephen Rothwell
2018-07-20 1:49 Stephen Rothwell
2018-06-06 4:37 Stephen Rothwell
2017-12-04 22:59 Stephen Rothwell
2017-11-09 23:31 Stephen Rothwell
2017-11-10 4:37 ` Cong Wang
2017-11-10 4:39 ` David Miller
2017-10-30 17:24 Mark Brown
2017-10-30 17:08 Mark Brown
2017-10-30 17:02 Mark Brown
2017-10-30 17:43 ` Jakub Kicinski
2017-10-30 18:10 ` Mark Brown
2017-06-30 0:57 Stephen Rothwell
2017-05-03 1:07 Stephen Rothwell
2017-05-03 4:08 ` David Miller
2017-03-24 0:05 Stephen Rothwell
2017-03-24 0:10 ` David Miller
2017-03-24 1:24 ` Alexei Starovoitov
2017-02-02 1:49 Stephen Rothwell
2017-02-02 8:40 ` Yotam Gigi
2016-10-02 22:37 Stephen Rothwell
2016-10-02 22:32 Stephen Rothwell
2016-06-30 1:01 Stephen Rothwell
2016-05-03 3:15 Stephen Rothwell
2015-07-14 1:46 Stephen Rothwell
2015-07-14 8:23 ` Nikolay Aleksandrov
2015-05-28 4:17 Stephen Rothwell
2015-05-28 13:34 ` Tom Lendacky
2015-02-12 1:05 Stephen Rothwell
2014-06-12 2:01 Stephen Rothwell
2014-06-05 3:13 Stephen Rothwell
2014-06-05 3:26 ` KY Srinivasan
2013-12-18 1:46 Stephen Rothwell
2013-12-18 1:56 ` Jeff Kirsher
2013-12-18 2:19 ` Stephen Rothwell
2013-09-05 5:23 Stephen Rothwell
2013-09-05 5:19 Stephen Rothwell
2013-09-05 7:33 ` Daniel Borkmann
2013-09-02 3:12 Stephen Rothwell
2013-06-17 2:44 Stephen Rothwell
2013-06-17 2:38 Stephen Rothwell
2013-04-22 3:09 Stephen Rothwell
2013-04-23 0:42 ` David Miller
2013-04-22 3:03 Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-04-22 2:48 Stephen Rothwell
2013-04-22 2:43 Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-03-27 0:57 Stephen Rothwell
2013-03-27 4:54 ` David Miller
2013-03-12 0:33 Stephen Rothwell
2013-03-12 10:49 ` David Miller
2012-11-08 23:53 Stephen Rothwell
2012-11-10 23:34 ` David Miller
2012-10-02 1:51 Stephen Rothwell
2012-09-26 1:46 Stephen Rothwell
2012-07-19 1:15 Stephen Rothwell
2012-07-19 1:18 ` Jeff Kirsher
2012-02-27 1:11 Stephen Rothwell
2012-02-27 4:05 ` David Miller
2012-02-29 3:21 ` Ben Hutchings
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=87k2l4yvek.fsf@free-electrons.com \
--to=gregory.clement@free-electrons.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).