* linux-next: manual merge of the samsung tree with the arm tree
@ 2010-02-24 0:33 Stephen Rothwell
2010-02-24 0:58 ` Ben Dooks
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-02-24 0:33 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-next, linux-kernel, Russell King
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.
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the samsung tree with the arm tree
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
2010-02-24 1:03 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Ben Dooks @ 2010-02-24 0:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Ben Dooks, linux-next, linux-kernel, Russell King
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the samsung tree with the arm tree
2010-02-24 0:58 ` Ben Dooks
@ 2010-02-24 1:03 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-02-24 1:03 UTC (permalink / raw)
To: Ben Dooks; +Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
Hi Ben,
On Wed, 24 Feb 2010 00:58:22 +0000 Ben Dooks <ben-linux@fluff.org> wrote:
>
> yeah, I intend on getting this merged to RMK asap, i've unfortunately
> been unwell and this is becoming overdue :(
OK, thanks. Get well.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the samsung tree with the arm tree
@ 2014-07-25 0:24 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2014-07-25 0:24 UTC (permalink / raw)
To: Kukjin Kim, Russell King
Cc: linux-next, linux-kernel, Uwe Kleine-König, Tomasz Figa
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s5pv210/include/mach/memory.h between commit 3ae4e9812941
("ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from
<mach/memory.h>") from the arm tree and commit d78c16ccde96 ("ARM:
SAMSUNG: Remove remaining legacy code") from the samsung tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the samsung tree with the arm tree
2010-02-24 23:48 Stephen Rothwell
@ 2010-03-01 9:39 ` Russell King
0 siblings, 0 replies; 6+ messages in thread
From: Russell King @ 2010-03-01 9:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ben Dooks, linux-next, linux-kernel, Tony Lindgren, Kukjin Kim,
Adityapratap Sharma, Atul Dahiya
On Thu, Feb 25, 2010 at 10:48:19AM +1100, Stephen Rothwell wrote:
> Hi Ben,
>
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/mach-s5p6442/include/mach/debug-macro.S between commit
> 4e6d488af37980d224cbf298224db6173673f362 ("ARM: 5910/1: ARM: Add tmp
> register for addruart and loadsp") from the arm tree and commit
> 5f7f6a4a0df9b43051d57fdb8ea96c083247a08f ("ARM: S5P6442: Add Samsung
> S5P6442 CPU support") from the samsung tree.
You're getting this because I've dropped the branch containing all the
trees I'd merged over the last 3 months from the branch(es) you pull.
The PXA folk decided to rebase their tree and send Linus some of their
original commits independently of their previous pull - and their tree
was the first to be merged.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the samsung tree with the arm tree
@ 2010-02-24 23:48 Stephen Rothwell
2010-03-01 9:39 ` Russell King
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2010-02-24 23:48 UTC (permalink / raw)
To: Ben Dooks
Cc: linux-next, linux-kernel, Tony Lindgren, Russell King,
Kukjin Kim, Adityapratap Sharma, Atul Dahiya
Hi Ben,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s5p6442/include/mach/debug-macro.S between commit
4e6d488af37980d224cbf298224db6173673f362 ("ARM: 5910/1: ARM: Add tmp
register for addruart and loadsp") from the arm tree and commit
5f7f6a4a0df9b43051d57fdb8ea96c083247a08f ("ARM: S5P6442: Add Samsung
S5P6442 CPU support") from the samsung tree.
This conflict is a bit strange since this is a new file, but git is a bit
too clever :-)
I fixed it up (see the change from the samsung tree below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --git a/arch/arm/mach-s5p6442/include/mach/debug-macro.S b/arch/arm/mach-s5p6442/include/mach/debug-macro.S
index 1aae691..441962c 100644
--- a/arch/arm/mach-s5p6442/include/mach/debug-macro.S
+++ b/arch/arm/mach-s5p6442/include/mach/debug-macro.S
@@ -15,7 +15,7 @@
#include <mach/map.h>
#include <plat/regs-serial.h>
- .macro addruart, rx
+ .macro addruart, rx, tmp
mrc p15, 0, \rx, c1, c0
tst \rx, #1
ldreq \rx, = S3C_PA_UART
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-25 0:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2010-02-24 1:03 ` Stephen Rothwell
2010-02-24 23:48 Stephen Rothwell
2010-03-01 9:39 ` Russell King
2014-07-25 0:24 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).