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@xxxxxxxxxxxxxxxx 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html