linux-next: manual merge of the samsung tree with the arm tree
in [Kernel]
|
From: Stephen Rothwell on 24 Feb 2010 18:50 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(a)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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Russell King on 1 Mar 2010 04:50 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: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|
Pages: 1 Prev: ext4: Fixup rb_root initializations to use RB_ROOT Next: RE |