Patchwork [GIT,PULL,1/5] Tegra cleanups for 3.3

login
register
mail settings
Submitter Olof Johansson
Date Dec. 21, 2011, 7:14 p.m.
Message ID <CAOesGMja7+nA-VSF9bEmUJRbpLbVwZ+ngC1+qJ4Sz8L3Bx0m5A@mail.gmail.com>
Download mbox
Permalink /patch/132714/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.3/cleanup

Comments

Olof Johansson - Dec. 21, 2011, 7:14 p.m.
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@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(-)
Arnd Bergmann - Dec. 27, 2011, 10:19 p.m.
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
Olof Johansson - Dec. 27, 2011, 10:22 p.m.
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