From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Sascha Hauer <s.hauer@pengutronix.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: linux-next: manual merge of the i.MX tree with the arm-soc tree
Date: Fri, 9 Sep 2011 08:41:36 +0200 [thread overview]
Message-ID: <20110909064136.GG28816@pengutronix.de> (raw)
In-Reply-To: <20110909114016.4a2a35295d3c84e37663289e@canb.auug.org.au>
Hello,
On Fri, Sep 09, 2011 at 11:40:16AM +1000, Stephen Rothwell wrote:
> The conflict looks like this:
>
> diff --cc arch/arm/mach-imx/Makefile
> index f87cc55,d22096a..0000000
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@@ -3,7 -3,7 +3,11 @@@ obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1
> obj-$(CONFIG_SOC_IMX1) += clock-imx1.o mm-imx1.o
> obj-$(CONFIG_SOC_IMX21) += clock-imx21.o mm-imx21.o
>
> ++<<<<<<< HEAD
> +obj-$(CONFIG_SOC_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
> ++=======
> + obj-$(CONFIG_SOC_IMX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o
> ++>>>>>>> i.MX/for-next
>
> obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
> obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
>
> Given that there are no other references to SOC_MX25 in the resulting
> tree, I used the latter version.
That's right.
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-09-09 6:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-09 1:40 linux-next: manual merge of the i.MX tree with the arm-soc tree Stephen Rothwell
2011-09-09 6:41 ` Uwe Kleine-König [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-09 1:44 Stephen Rothwell
2011-09-09 6:40 ` Uwe Kleine-König
2011-09-11 3:34 ` Stephen Rothwell
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=20110909064136.GG28816@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sfr@canb.auug.org.au \
/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).