From: Ben Dooks <ben-linux@fluff.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Russell King <rmk@arm.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kukjin Kim <kgene.kim@samsung.com>,
Ben Dooks <ben-linux@fluff.org>
Subject: Re: linux-next: manual merge of the arm tree with the arm-current tree
Date: Mon, 18 Jan 2010 01:33:07 +0000 [thread overview]
Message-ID: <20100118013307.GD10014@trinity.fluff.org> (raw)
In-Reply-To: <20100118103534.a5dc3c66.sfr@canb.auug.org.au>
On Mon, Jan 18, 2010 at 10:35:34AM +1100, Stephen Rothwell wrote:
> Hi Russell,
>
> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/Makefile between commit 95b8f20fd6a2694a16b8addb190b942bfb670c88
> (ARM: fix badly placed mach/plat entries in Kconfig & Makefile"") from
> the arm-current tree and commit c4ffccddd54b669cc9683f2c69e31035e916a1a0
> ("ARM: S5P6440: Add new Kconfig and Makefiles") from the arm tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Is that from the merge of next-samsung or from two parts of the ARM
trees?
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> (Sorry, cut and paste diff)
> diff --cc arch/arm/Makefile
> index 9e75825,bbcd512..0000000
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@@ -184,7 -184,9 +185,8 @@@ plat-$(CONFIG_PLAT_ORION) := orio
> plat-$(CONFIG_PLAT_PXA) := pxa
> plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c samsung
> plat-$(CONFIG_PLAT_S3C64XX) := s3c64xx s3c samsung
> -plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
> + plat-$(CONFIG_PLAT_S5P) := s5p samsung s3c
> -plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
> +plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx s3c samsung
>
> ifeq ($(CONFIG_ARCH_EBSA110),y)
> # This is what happens if you forget the IOCS16 line.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
next prev parent reply other threads:[~2010-01-18 1:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-17 23:35 linux-next: manual merge of the arm tree with the arm-current tree Stephen Rothwell
2010-01-18 1:33 ` Ben Dooks [this message]
2010-01-18 3:34 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-12-14 23:54 Stephen Rothwell
2010-12-14 23:57 ` Russell King
2010-12-15 12:28 ` Dave Martin
2010-12-15 16:43 ` Russell King
2010-12-05 23:58 Stephen Rothwell
2010-10-11 23:33 Stephen Rothwell
2010-10-12 8:03 ` Uwe Kleine-König
2010-10-12 8:28 ` Russell King
2010-10-12 9:23 ` Uwe Kleine-König
2010-10-12 9:42 ` Russell King
2010-10-12 10:02 ` Uwe Kleine-König
2010-10-12 10:35 ` Sascha Hauer
2010-10-11 1:24 Stephen Rothwell
2010-10-11 7:48 ` Anders Larsen
2010-09-27 4:21 Stephen Rothwell
2010-07-26 1:13 Stephen Rothwell
2010-02-02 0:07 Stephen Rothwell
2009-05-06 1:32 Stephen Rothwell
2009-03-23 0:06 Stephen Rothwell
2009-02-15 23:39 Stephen Rothwell
2009-02-16 0:18 ` Ryan Mallon
2009-02-16 0:29 ` Russell King
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=20100118013307.GD10014@trinity.fluff.org \
--to=ben-linux@fluff.org \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--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 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.