From: "Shilimkar, Santosh" <santosh.shilimkar@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Tony Lindgren <tony@atomide.com>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Russell King <rmk@arm.linux.org.uk>
Subject: RE: linux-next: manual merge of the omap tree with the arm tree
Date: Thu, 28 May 2009 11:55:09 +0530 [thread overview]
Message-ID: <EAF47CD23C76F840A9E7FCE10091EFAB02B4BE3927@dbde02.ent.ti.com> (raw)
In-Reply-To: <20090528143138.2de9ad37.sfr@canb.auug.org.au>
> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Thursday, May 28, 2009 10:02 AM
> To: Tony Lindgren; linux-omap@vger.kernel.org
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org;
> Russell King; Shilimkar, Santosh
> Subject: linux-next: manual merge of the omap tree with the arm tree
>
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/Makefile between commit
> b4175b89921fefb2f352472fa6dccb0fc4fb37d9
> ("[ARM] sort machine- and plat- by CONFIG* name") from the
> arm tree and
> commit 68394eae0fc4e801fc2ae33055b24a9754669a7b ("ARM: OMAP4:
> Add support
> for 4430 SDP") from the omap tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/Makefile
> index e97c21b,676d10d..0000000
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@@ -99,72 -99,65 +99,73 @@@ CHECKFLAGS += -D__arm_
> #Default value
> head-y := arch/arm/kernel/head$(MMUEXT).o
> arch/arm/kernel/init_task.o
> textofs-y := 0x00008000
- machine-$(CONFIG_ARCH_W90X900) := w90x900
> +
> +# Machine directory name. This list is sorted alphanumerically
> +# by CONFIG_* macro name.
> +machine-$(CONFIG_ARCH_AAEC2000) := aaec2000
> +machine-$(CONFIG_ARCH_AT91) := at91
> +machine-$(CONFIG_ARCH_CLPS711X) := clps711x
> +machine-$(CONFIG_ARCH_DAVINCI) := davinci
> +machine-$(CONFIG_ARCH_EBSA110) := ebsa110
> +machine-$(CONFIG_ARCH_EP93XX) := ep93xx
> +machine-$(CONFIG_ARCH_GEMINI) := gemini
> +machine-$(CONFIG_ARCH_H720X) := h720x
> +machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
> +machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
> +machine-$(CONFIG_ARCH_IOP32X) := iop32x
> +machine-$(CONFIG_ARCH_IOP33X) := iop33x
> +machine-$(CONFIG_ARCH_IXP2000) := ixp2000
> +machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx
> +machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
> +machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood
> +machine-$(CONFIG_ARCH_KS8695) := ks8695
> +machine-$(CONFIG_ARCH_L7200) := l7200
> +machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
> +machine-$(CONFIG_ARCH_LOKI) := loki
> +machine-$(CONFIG_ARCH_MMP) := mmp
> +machine-$(CONFIG_ARCH_MSM) := msm
> +machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
> +machine-$(CONFIG_ARCH_MX1) := mx1
> +machine-$(CONFIG_ARCH_MX2) := mx2
> +machine-$(CONFIG_ARCH_MX3) := mx3
> +machine-$(CONFIG_ARCH_NETX) := netx
> +machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx
> +machine-$(CONFIG_ARCH_OMAP1) := omap1
> +machine-$(CONFIG_ARCH_OMAP2) := omap2
> +machine-$(CONFIG_ARCH_OMAP3) := omap2
> ++machine-$(CONFIG_ARCH_OMAP4) := omap2
++ Is this really ok ?
> +machine-$(CONFIG_ARCH_ORION5X) := orion5x
> +machine-$(CONFIG_ARCH_PNX4008) := pnx4008
> +machine-$(CONFIG_ARCH_PXA) := pxa
next prev parent reply other threads:[~2009-05-28 6:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-28 4:31 linux-next: manual merge of the omap tree with the arm tree Stephen Rothwell
2009-05-28 6:25 ` Shilimkar, Santosh [this message]
2009-05-28 6:34 ` Stephen Rothwell
2009-05-28 6:40 ` Shilimkar, Santosh
2009-08-19 5:04 Stephen Rothwell
2009-08-20 10:20 ` Tony Lindgren
2009-08-20 13:03 ` Shilimkar, Santosh
2009-08-20 13:13 ` Shilimkar, Santosh
2009-08-20 13:55 ` Tony Lindgren
2009-08-24 13:07 ` Tony Lindgren
2009-08-24 13:14 ` Stephen Rothwell
2010-02-04 23:20 Stephen Rothwell
2010-02-04 23:30 ` Tony Lindgren
2010-02-05 0:16 ` Stephen Rothwell
2010-02-05 4:04 ` Tony Lindgren
2010-02-15 15:03 ` Russell King
2010-02-17 19:33 ` Tony Lindgren
2010-07-04 23:20 Stephen Rothwell
2010-07-05 1:46 ` Nicolas Pitre
2010-07-05 7:14 ` Stephen Rothwell
2010-07-05 13:44 ` Tony Lindgren
2010-07-08 1:37 Stephen Rothwell
2010-07-08 10:14 ` Tony Lindgren
2010-12-26 22:41 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=EAF47CD23C76F840A9E7FCE10091EFAB02B4BE3927@dbde02.ent.ti.com \
--to=santosh.shilimkar@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
--cc=tony@atomide.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).