Subject: RE: linux-next: manual merge of the s5p tree with the arm tree

From: Kukjin Kim <[email-masked]>
Date: Mon, 18 Oct 2010 10:04:11 +0900

Stephen wrote:
> Hi Kukjin,
Hi ;-)

> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p64x0/mach-smdk6440.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> cae6a3066d19a0c8b69cb25ee42b949ad6fb8c66 ("ARM: S5P64X0: Move SMDK6440
> board file and Add SMDK6450 board file") from the s5p tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.  I also
> applied the following merge fix patch:
> 
Ok...thanks, if need any my handling, please let me know.

> From: Stephen Rothwell <[email-masked]>
> Date: Mon, 18 Oct 2010 10:52:24 +1100
> Subject: [PATCH] s5p: merge fix for removal of fielda from machine_desc
> 
> Signed-off-by: Stephen Rothwell <[email-masked]>
> ---
>  arch/arm/mach-s5p64x0/mach-smdk6450.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-
> s5p64x0/mach-smdk6450.c
> index 8e98217..d609f5a 100644
> --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
> @@ -171,8 +171,6 @@ static void __init smdk6450_machine_init(void)
> 
>  MACHINE_START(SMDK6450, "SMDK6450")
>  	/* Maintainer: Kukjin Kim <[email-masked]> */
> -	.phys_io	= S5P6450_PA_UART(0) & 0xfff00000,
> -	.io_pg_offst	= (((u32)S3C_VA_UART) >> 18) & 0xfffc,
>  	.boot_params	= S5P64X0_PA_SDRAM + 0x100,
> 
>  	.init_irq	= s5p6450_init_irq,
> --
> 1.7.1
> 
> --
> Cheers,
> Stephen Rothwell                    [email-masked]
> 
> diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
> index 59d9f5b,28de0a5..0000000
> --- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
> +++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
> @@@ -135,7 -152,9 +152,7 @@@ static void __init smdk6440_machine_ini
> 
>   MACHINE_START(SMDK6440, "SMDK6440")
>   	/* Maintainer: Kukjin Kim <[email-masked]> */
> - 	.boot_params	= S5P_PA_SDRAM + 0x100,
>  -	.phys_io	= S5P6440_PA_UART(0) & 0xfff00000,
>  -	.io_pg_offst	= (((u32)S3C_VA_UART) >> 18) & 0xfffc,
> + 	.boot_params	= S5P64X0_PA_SDRAM + 0x100,
> 
>   	.init_irq	= s5p6440_init_irq,
>   	.map_io		= smdk6440_map_io,

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email-masked]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.