Subject: Re: linux-next: manual merge of the tegra tree with the tree

From: Stephen Warren <[email-masked]>
Date: Thu, 08 Dec 2011 21:37:19 -0700

On 12/08/2011 05:47 PM, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
> 
> Hi all,
> 
> Today's linux-next merge of the tegra tree got a conflict in
> arch/arm/mach-tegra/include/mach/entry-macro.S between commit
> afed2a261825 ("ARM: tegra2: convert to CONFIG_MULTI_IRQ_HANDLER") from
> the arm tree and commit f5ce5e7e9cc3 (arm/tegra: Remove code that's
> ifndef CONFIG_ARM_GIC"") from the tegra tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

StephenR,

I'm not very familiar with git diff for merge conflicts, so I might be
wrong here, but I did reproduce this conflict to investigate, and I
think your fixup isn't quite correct.

I think you're left with two separate copies of the macro
arch_ret_to_user, and your conflict resolution diff should be more like
that below:

diff --git a/arch/arm/mach-tegra/include/mach/entry-macro.S
b/arch/arm/mach-tegra/include/mach/entry-macro.S
index ac11262..e577cfe 100644
--- a/arch/arm/mach-tegra/include/mach/entry-macro.S
+++ b/arch/arm/mach-tegra/include/mach/entry-macro.S
@@ -18,21 +18,3 @@

        .macro  arch_ret_to_user, tmp1, tmp2
        .endm
-
-#if !defined(CONFIG_ARM_GIC)
-       /* legacy interrupt controller for AP16 */
-
-       .macro  get_irqnr_preamble, base, tmp
-       @ enable imprecise aborts
-       cpsie   a
-       @ EVP base at 0xf010f000
-       mov \base, #0xf0000000
-       orr \base, #0x00100000
-       orr \base, #0x0000f000
-       .endm
-
-       .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-       ldr \irqnr, [\base, #0x20]      @ EVT_IRQ_STS
-       cmp \irqnr, #0x80
-       .endm
-#endif

Thanks for the work on linux-next.

-- 
nvpublic