From: Ben Dooks <ben-linux@fluff.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ben Dooks <ben-linux@fluff.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the samsung tree with the arm tree
Date: Wed, 24 Feb 2010 00:58:22 +0000 [thread overview]
Message-ID: <20100224005822.GP10014@trinity.fluff.org> (raw)
In-Reply-To: <20100224113306.465efa4d.sfr@canb.auug.org.au>
On Wed, Feb 24, 2010 at 11:33:06AM +1100, Stephen Rothwell wrote:
> Hi Ben,
>
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/Makefile between various commits from the arm tree and various
> commits from the samsung tree.
yeah, I intend on getting this merged to RMK asap, i've unfortunately
been unwell and this is becoming overdue :(
> 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 00ea105,13c5c2b..0000000
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@@ -186,11 -182,11 +186,11 @@@ plat-$(CONFIG_PLAT_IOP) := io
> plat-$(CONFIG_PLAT_NOMADIK) := nomadik
> plat-$(CONFIG_PLAT_ORION) := orion
> 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_PLAT_S3C24XX) := s3c24xx samsung
> + plat-$(CONFIG_ARCH_S3C64XX) := samsung
> + plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx samsung
> + plat-$(CONFIG_PLAT_S5P) := s5p samsung
> -plat-$(CONFIG_ARCH_STMP3XXX) := stmp3xxx
> +plat-$(CONFIG_PLAT_VERSATILE) := versatile
>
> 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-02-24 0:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-24 0:33 linux-next: manual merge of the samsung tree with the arm tree Stephen Rothwell
2010-02-24 0:58 ` Ben Dooks [this message]
2010-02-24 1:03 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2010-02-24 23:48 Stephen Rothwell
2010-03-01 9:39 ` Russell King
2014-07-25 0:24 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=20100224005822.GP10014@trinity.fluff.org \
--to=ben-linux@fluff.org \
--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.