All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicolas Pitre <nicolas.pitre@linaro.org>,
	Russell King <rmk@arm.linux.org.uk>
Subject: linux-next: manual merge of the s5p tree with the arm tree
Date: Mon, 18 Oct 2010 10:55:24 +1100	[thread overview]
Message-ID: <20101018105524.e2460535.sfr@canb.auug.org.au> (raw)

Hi Kukjin,

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:

From: Stephen Rothwell <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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 <kgene.kim@samsung.com> */
-	.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                    sfr@canb.auug.org.au

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 <kgene.kim@samsung.com> */
- 	.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,

             reply	other threads:[~2010-10-17 23:55 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-17 23:55 Stephen Rothwell [this message]
2010-10-18  1:04 ` linux-next: manual merge of the s5p tree with the arm tree Kukjin Kim
  -- strict thread matches above, loose matches on Subject: below --
2012-01-05  1:09 Stephen Rothwell
2012-01-05  2:34 ` Kukjin Kim
2012-01-04  2:18 Stephen Rothwell
2012-01-04  9:07 ` Russell King
2012-01-05  0:46   ` Kukjin Kim
2011-12-27 23:36 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-27 23:33 Stephen Rothwell
2011-12-28  8:33 ` Kukjin Kim
2011-12-27 23:21 Stephen Rothwell
2011-12-27 23:17 Stephen Rothwell
2011-12-27 23:07 Stephen Rothwell
2011-12-28  8:01 ` Kukjin Kim
2011-12-05  0:01 Stephen Rothwell
2011-11-22  2:05 Stephen Rothwell
2011-11-22  2:01 Stephen Rothwell
2011-10-11  2:07 Stephen Rothwell
2011-09-22  2:08 Stephen Rothwell
2011-07-20  1:35 Stephen Rothwell
2011-07-20  8:04 ` Russell King
2011-07-20  8:25   ` Stephen Rothwell
2011-07-20 10:38     ` Kukjin Kim
2011-05-23  1:58 Stephen Rothwell
2010-10-17 23:50 Stephen Rothwell
2010-10-18  0:57 ` Kukjin Kim
2010-10-18 10:39 ` Kukjin Kim
2010-07-30  0:48 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=20101018105524.e2460535.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=kgene.kim@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nicolas.pitre@linaro.org \
    --cc=rmk@arm.linux.org.uk \
    /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.