MIME-Version: 1.0
In-Reply-To: <20120516185045.2f9e9274f373d584fd499eb2@canb.auug.org.au>
References: <20120516185045.2f9e9274f373d584fd499eb2@canb.auug.org.au>
Date: Wed, 16 May 2012 17:36:30 +0800
Message-ID: <CAN1soZzBZUoCR5KgXbWBKAnxaR92CKFWqNMNLnm-dAD3xoH6yw@mail.gmail.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree
From: Haojian Zhuang <haojian.zhuang@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Russell King <rmk@arm.linux.org.uk>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1217
Lines: 34

On Wed, May 16, 2012 at 4:50 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/Kconfig between commit 98fab064d321 ("ARM: Remove unnecessary
> selection of TICK_ONESHOT") from the arm tree and commit c24b31147a06
> ("ARM: mmp: support DT in irq") from the arm-soc tree.
>
> Just context changes. ?I fixed it up (see below) and can carry the fix as
> necessary.
> --
> Cheers,
> Stephen Rothwell ? ? ? ? ? ? ? ? ? ?sfr@canb.auug.org.au
>
> diff --cc arch/arm/Kconfig
> index b1a717c,852b12b..0000000
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -627,6 -616,8 +611,7 @@@ config ARCH_MM
> ? ? ? ?select CLKDEV_LOOKUP
> ? ? ? ?select GENERIC_CLOCKEVENTS
> ? ? ? ?select GPIO_PXA
> + ? ? ? select IRQ_DOMAIN
> ?- ? ? ?select TICK_ONESHOT
> ? ? ? ?select PLAT_PXA
> ? ? ? ?select SPARSE_IRQ
> ? ? ? ?select GENERIC_ALLOCATOR

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/