From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755178AbbCaOEW (ORCPT ); Tue, 31 Mar 2015 10:04:22 -0400 Received: from foss.arm.com ([217.140.101.70]:35470 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754389AbbCaOET (ORCPT ); Tue, 31 Mar 2015 10:04:19 -0400 Date: Tue, 31 Mar 2015 15:04:10 +0100 From: Catalin Marinas To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Zhizhou Zhang , linux-next@vger.kernel.org, Will Deacon , linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the arm64 tree with the arm-soc tree Message-ID: <20150331140407.GA23192@MBP> References: <20150331102122.34db1c6e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150331102122.34db1c6e@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Tue, Mar 31, 2015 at 10:21:22AM +1100, Stephen Rothwell wrote: > diff --cc arch/arm64/configs/defconfig > index f3c8619f8fe1,e07896c819ef..000000000000 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@@ -31,9 -31,12 +31,13 @@@ CONFIG_MODULES= > CONFIG_MODULE_UNLOAD=y > # CONFIG_BLK_DEV_BSG is not set > # CONFIG_IOSCHED_DEADLINE is not set > + CONFIG_ARCH_EXYNOS7=y > CONFIG_ARCH_FSL_LS2085A=y > CONFIG_ARCH_MEDIATEK=y > +CONFIG_ARCH_SPRD=y > + CONFIG_ARCH_SEATTLE=y > + CONFIG_ARCH_TEGRA=y > + CONFIG_ARCH_TEGRA_132_SOC=y > CONFIG_ARCH_THUNDER=y > CONFIG_ARCH_VEXPRESS=y > CONFIG_ARCH_XGENE=y Thanks. Looks fine. -- Catalin