linux-next: manual merge of the arm64 tree with the arm-soc tree
Catalin Marinas
catalin.marinas at arm.com
Tue Mar 31 07:04:10 PDT 2015
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
More information about the linux-arm-kernel
mailing list