All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jason Cooper <jason@lakedaemon.net>, <andrew@lunn.ch>,
	<gregory.clement@free-electrons.com>,
	<linux-arm-kernel@lists.infradead.org>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Kumar Gala <galak@codeaurora.org>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Wed, 26 Feb 2014 12:46:35 +1100	[thread overview]
Message-ID: <20140226124635.46eb18b096b7835e28e62d3e@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f ("ARM: qcom: Split
Qualcomm support into legacy and multiplatform") from the arm-soc tree
and commit a02dd0271d01 ("ARM: mvebu: select dtbs from MACH_ARMADA_*")
from the mvebu 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/Makefile
index cf8bb9f05c94,01f9ceb450ca..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -123,9 -138,16 +139,13 @@@ kirkwood := 
  	kirkwood-ts219-6282.dtb \
  	kirkwood-ts419-6281.dtb \
  	kirkwood-ts419-6282.dtb
+ dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
- dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -	qcom-msm8960-cdp.dtb \
 -	qcom-apq8074-dragonboard.dtb
+ dtb-$(CONFIG_MACH_ARMADA_370) += \
+ 	armada-370-db.dtb \
  	armada-370-mirabox.dtb \
  	armada-370-netgear-rn102.dtb \
  	armada-370-netgear-rn104.dtb \

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jason Cooper <jason@lakedaemon.net>,
	andrew@lunn.ch, gregory.clement@free-electrons.com,
	linux-arm-kernel@lists.infradead.org,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Kumar Gala <galak@codeaurora.org>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Wed, 26 Feb 2014 12:46:35 +1100	[thread overview]
Message-ID: <20140226124635.46eb18b096b7835e28e62d3e@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f ("ARM: qcom: Split
Qualcomm support into legacy and multiplatform") from the arm-soc tree
and commit a02dd0271d01 ("ARM: mvebu: select dtbs from MACH_ARMADA_*")
from the mvebu 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/Makefile
index cf8bb9f05c94,01f9ceb450ca..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -123,9 -138,16 +139,13 @@@ kirkwood := 
  	kirkwood-ts219-6282.dtb \
  	kirkwood-ts419-6281.dtb \
  	kirkwood-ts419-6282.dtb
+ dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
- dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -	qcom-msm8960-cdp.dtb \
 -	qcom-apq8074-dragonboard.dtb
+ dtb-$(CONFIG_MACH_ARMADA_370) += \
+ 	armada-370-db.dtb \
  	armada-370-mirabox.dtb \
  	armada-370-netgear-rn102.dtb \
  	armada-370-netgear-rn104.dtb \

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Wed, 26 Feb 2014 12:46:35 +1100	[thread overview]
Message-ID: <20140226124635.46eb18b096b7835e28e62d3e@canb.auug.org.au> (raw)

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/boot/dts/Makefile between commit 8fc1b0f87d9f ("ARM: qcom: Split
Qualcomm support into legacy and multiplatform") from the arm-soc tree
and commit a02dd0271d01 ("ARM: mvebu: select dtbs from MACH_ARMADA_*")
from the mvebu tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/boot/dts/Makefile
index cf8bb9f05c94,01f9ceb450ca..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -123,9 -138,16 +139,13 @@@ kirkwood := 
  	kirkwood-ts219-6282.dtb \
  	kirkwood-ts419-6281.dtb \
  	kirkwood-ts419-6282.dtb
+ dtb-$(CONFIG_ARCH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_MACH_KIRKWOOD) += $(kirkwood)
+ dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
- dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
 -dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
 -	qcom-msm8960-cdp.dtb \
 -	qcom-apq8074-dragonboard.dtb
+ dtb-$(CONFIG_MACH_ARMADA_370) += \
+ 	armada-370-db.dtb \
  	armada-370-mirabox.dtb \
  	armada-370-netgear-rn102.dtb \
  	armada-370-netgear-rn104.dtb \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140226/06e5c9d0/attachment.sig>

             reply	other threads:[~2014-02-26  1:46 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-26  1:46 Stephen Rothwell [this message]
2014-02-26  1:46 ` linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell
2014-02-26  1:46 ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:41 Stephen Rothwell
2022-05-09 23:41 ` Stephen Rothwell
2022-05-10 13:59 ` Krzysztof Kozlowski
2022-05-10 13:59   ` Krzysztof Kozlowski
2022-05-10 14:42   ` Arnd Bergmann
2022-05-10 14:42     ` Arnd Bergmann
2018-05-16 22:47 Stephen Rothwell
2018-05-16 22:47 ` Stephen Rothwell
2017-04-11 22:34 Stephen Rothwell
2017-04-11 22:34 ` Stephen Rothwell
2017-04-12  8:23 ` Gregory CLEMENT
2017-04-12  8:23   ` Gregory CLEMENT
2017-04-12 10:51   ` Stephen Rothwell
2017-04-12 10:51     ` Stephen Rothwell
2016-04-13 23:29 Stephen Rothwell
2016-04-13 23:29 ` Stephen Rothwell
2016-04-13 23:29 ` Stephen Rothwell
2016-02-17 23:33 Stephen Rothwell
2016-02-17 23:33 ` Stephen Rothwell
2016-02-17 23:33 ` Stephen Rothwell
2015-12-02 11:12 Mark Brown
2015-12-02 11:12 ` Mark Brown
2015-12-02 11:12 ` Mark Brown
2015-12-02 11:18 ` Mark Brown
2015-12-02 11:18   ` Mark Brown
2015-12-02 11:21   ` Arnd Bergmann
2015-12-02 11:21     ` Arnd Bergmann
2015-12-02 13:49     ` Gregory CLEMENT
2015-12-02 13:49       ` Gregory CLEMENT
2015-12-02 15:09       ` Arnd Bergmann
2015-12-02 15:09         ` Arnd Bergmann
2015-10-31 23:35 Stephen Rothwell
2015-10-31 23:35 ` Stephen Rothwell
2015-10-31 23:35 ` Stephen Rothwell
2015-01-13  0:20 Stephen Rothwell
2015-01-13  0:20 ` Stephen Rothwell
2015-01-13  0:20 ` Stephen Rothwell
2015-01-13  1:05 ` Andrew Lunn
2015-01-13  1:05   ` Andrew Lunn
2014-05-06  1:07 Stephen Rothwell
2014-05-06  1:07 ` Stephen Rothwell
2014-05-06  1:07 ` Stephen Rothwell
2014-05-06  1:13 ` Olof Johansson
2014-05-06  1:13   ` Olof Johansson
2014-05-06  1:13   ` Olof Johansson
2014-03-18  0:21 Stephen Rothwell
2014-03-18  0:21 ` Stephen Rothwell
2014-03-18  0:21 ` Stephen Rothwell
2013-08-19  6:05 Stephen Rothwell
2013-08-19  6:05 ` Stephen Rothwell
2013-08-19  6:05 ` Stephen Rothwell
2013-08-19 20:57 ` Jason Cooper
2013-08-19 20:57   ` Jason Cooper
2013-08-19 21:09   ` Olof Johansson
2013-08-19 21:09     ` Olof Johansson
2013-08-19 21:09     ` Olof Johansson
2013-08-19 21:38     ` Jason Cooper
2013-08-19 21:38       ` Jason Cooper
2013-08-19 21:38       ` Jason Cooper

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=20140226124635.46eb18b096b7835e28e62d3e@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=andrew@lunn.ch \
    --cc=arnd@arndb.de \
    --cc=galak@codeaurora.org \
    --cc=gregory.clement@free-electrons.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.