Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758249Ab0G3A6h (ORCPT ); Thu, 29 Jul 2010 20:58:37 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:38816 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755319Ab0G3A6g (ORCPT ); Thu, 29 Jul 2010 20:58:36 -0400 Date: Fri, 30 Jul 2010 10:58:34 +1000 From: Stephen Rothwell To: Erik Gilling , Colin Cross , Olof Johansson Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Changhwan Youn , Kukjin Kim Subject: linux-next: manual merge of the tegra tree with the s5p tree Message-Id: <20100730105834.d7ac047f.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1234 Lines: 33 Hi all, Today's linux-next merge of the tegra tree got a conflict in arch/arm/mm/Kconfig between commit 9d2ef2d3944bb387df220fdeec93abc38b62b627 ("ARM: S5PV310: Add new Kconfig and Makefiles") from the s5p tree and commit 7e3b9536bd5ba23b3c94055bdf8c2fd45d9f8e62 ("[ARM] tegra: initial tegra support") from the tegra tree. 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/mm/Kconfig index d6ffcee,aa26573..0000000 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@@ -772,7 -783,7 +772,7 @@@ config CACHE_L2X depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \ ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \ - ARCH_S5PV310 - ARCH_TEGRA ++ ARCH_S5PV310 || ARCH_TEGRA default y select OUTER_CACHE select OUTER_CACHE_SYNC -- 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/