Subject: Re: linux-next: manual merge of the samsung tree with the arm tree

From: Ben Dooks <[email-masked]>
Date: Wed, 24 Feb 2010 00:58:22 +0000

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                    [email-masked]
> 
> 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 [email-masked]
> 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.