Home » Mailing list archives » linux-kernel » 2010 » October » 17

linux-next: manual merge of the msm tree with the arm tree

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stephen Rothwell
Subject: linux-next: manual merge of the msm tree with the arm tree
Date: Sunday, October 17, 2010 - 4:35 pm

Hi Daniel,

Today's linux-next merge of the msm tree got a conflict in
arch/arm/mach-msm/include/mach/debug-macro.S between commit
08a610d9ef5394525b0328da0162d7b58c982cc4 ("arm: return both physical and
virtual addresses from addruart") from the arm tree and commit
46fe5f29e3062f681cc3cf07a604d82396faea89 ("msm: allow uart to be
conditionally disabled") from the msm tree.

Just context changes.  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/mach-msm/include/mach/debug-macro.S
index 3c35b0d,238c4f1..0000000
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@@ -19,11 -19,13 +19,11 @@@
  #include <mach/hardware.h>
  #include <mach/msm_iomap.h>
  
- #ifdef CONFIG_MSM_DEBUG_UART
+ #ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS
 -	.macro	addruart, rx, tmp
 +	.macro	addruart, rp, rv
  	@ see if the MMU is enabled and select appropriate base address
 -	mrc	p15, 0, \rx, c1, c0
 -	tst	\rx, #1
 -	ldreq	\rx, =MSM_DEBUG_UART_PHYS
 -	ldrne	\rx, =MSM_DEBUG_UART_BASE
 +	ldr	\rp, =MSM_DEBUG_UART_PHYS
 +	ldr	\rv, =MSM_DEBUG_UART_BASE
  	.endm
  
  	.macro	senduart,rd,rx
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
linux-next: manual merge of the msm tree with the arm tree, Stephen Rothwell, (Sun Oct 17, 4:35 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Stephen Rothwell, (Sun Oct 17, 5:02 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Russell King, (Mon Oct 18, 1:15 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 10:26 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Russell King, (Mon Oct 18, 11:20 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 11:46 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Mon Oct 18, 12:29 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 1:12 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Arnd Bergmann, (Mon Oct 18, 1:19 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 1:19 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 1:37 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Arnd Bergmann, (Mon Oct 18, 1:48 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Mon Oct 18, 1:57 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Russell King, (Mon Oct 18, 1:58 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 2:05 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Mon Oct 18, 2:11 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Mon Oct 18, 2:17 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 2:29 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 2:35 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Russell King, (Mon Oct 18, 2:58 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 3:27 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Mon Oct 18, 3:35 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Joe Perches, (Mon Oct 18, 3:53 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 4:09 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Mon Oct 18, 4:32 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Mon Oct 18, 4:45 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Mon Oct 18, 7:47 pm)
Re: linux-next: manual merge of the msm tree with the arm tree, Arnd Bergmann, (Tue Oct 19, 6:18 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Tue Oct 19, 9:55 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Tue Oct 19, 10:03 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Nicolas Pitre, (Tue Oct 19, 10:18 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Russell King, (Tue Oct 19, 11:34 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Tue Oct 19, 11:42 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Tue Oct 19, 11:49 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Russell King, (Tue Oct 19, 11:53 am)
Re: linux-next: manual merge of the msm tree with the arm tree, Daniel Walker, (Tue Oct 19, 12:24 pm)