* [GIT PULL 1/5] Tegra cleanups for 3.3
@ 2011-12-21 19:14 Olof Johansson
2011-12-27 22:19 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Olof Johansson @ 2011-12-21 19:14 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Please pull the following cleanups for tegra. Thanks!
The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/cleanup
Olof Johansson (1):
arm/tegra: fix variable formatting in makefile
Stephen Warren (1):
arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
pdeschrijver at nvidia.com (1):
arm/tegra: remove unused defines
arch/arm/mach-tegra/Makefile | 26 ++++++++++++------------
arch/arm/mach-tegra/include/mach/entry-macro.S | 23 ---------------------
arch/arm/mach-tegra/irq.c | 4 ---
3 files changed, 13 insertions(+), 40 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread* [GIT PULL 1/5] Tegra cleanups for 3.3
2011-12-21 19:14 [GIT PULL 1/5] Tegra cleanups for 3.3 Olof Johansson
@ 2011-12-27 22:19 ` Arnd Bergmann
2011-12-27 22:22 ` Olof Johansson
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2011-12-27 22:19 UTC (permalink / raw)
To: linux-arm-kernel
On Wednesday 21 December 2011, Olof Johansson wrote:
> Hi Arnd,
>
> Please pull the following cleanups for tegra. Thanks!
>
>
> The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
>
> Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
>
> are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/cleanup
Pulled and resolved a conflict with Marc's "ARM: tegra2: convert to
CONFIG_MULTI_IRQ_HANDLER" patch, which leaves entry-macro.S
almost empty with these contents:
.macro disable_fiq
.endm
.macro arch_ret_to_user, tmp1, tmp2
.endm
Please confirm if this is the correct resolution.
Thanks,
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread* [GIT PULL 1/5] Tegra cleanups for 3.3
2011-12-27 22:19 ` Arnd Bergmann
@ 2011-12-27 22:22 ` Olof Johansson
0 siblings, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2011-12-27 22:22 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Dec 27, 2011 at 2:19 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wednesday 21 December 2011, Olof Johansson wrote:
>> Hi Arnd,
>>
>> Please pull the following cleanups for tegra. Thanks!
>>
>>
>> The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416:
>>
>> ? Linux 3.2-rc4 (2011-12-01 14:56:01 -0800)
>>
>> are available in the git repository at:
>> ? git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/cleanup
>
> Pulled and resolved a conflict with Marc's "ARM: tegra2: convert to
> CONFIG_MULTI_IRQ_HANDLER" patch, which leaves entry-macro.S
> almost empty with these contents:
>
> ? ? ? ?.macro ?disable_fiq
> ? ? ? ?.endm
>
> ? ? ? ?.macro ?arch_ret_to_user, tmp1, tmp2
> ? ? ? ?.endm
>
> Please confirm if this is the correct resolution.
>
Yep, that's the expected resolution. Thanks!
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-27 22:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-21 19:14 [GIT PULL 1/5] Tegra cleanups for 3.3 Olof Johansson
2011-12-27 22:19 ` Arnd Bergmann
2011-12-27 22:22 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox