From: Stephen Warren <swarren@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Erik Gilling <konkers@android.com>,
Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Marc Zyngier <marc.zyngier@arm.com>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the tegra tree with the tree
Date: Thu, 08 Dec 2011 21:37:19 -0700 [thread overview]
Message-ID: <4EE1907F.5000003@nvidia.com> (raw)
In-Reply-To: <20111209114736.d418deb7228f2b544434b77b@canb.auug.org.au>
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
next prev parent reply other threads:[~2011-12-09 4:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-09 0:47 linux-next: manual merge of the tegra tree with the tree Stephen Rothwell
2011-12-09 4:37 ` Stephen Warren [this message]
2011-12-09 5:45 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-09-12 6:43 Stephen Rothwell
2012-09-12 16:12 ` Greg KH
2012-09-12 16:14 ` Stephen Warren
2013-01-09 2:58 Stephen Rothwell
2013-01-09 11:48 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EE1907F.5000003@nvidia.com \
--to=swarren@nvidia.com \
--cc=ccross@android.com \
--cc=konkers@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=olof@lixom.net \
--cc=rmk@arm.linux.org.uk \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.