| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 30 Jul 2010 10:58:34 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Erik Gilling <konkers@...roid.com>,
Colin Cross <ccross@...roid.com>,
Olof Johansson <olof@...om.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Changhwan Youn <chaos.youn@...sung.com>,
Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the tegra tree with the s5p tree
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@...b.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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists