| 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: Thu, 11 Feb 2010 10:23:59 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Sascha Hauer <s.hauer@...gutronix.de>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Amit Kucheria <amit.kucheria@...onical.com>
Subject: linux-next: manual merge of the i.MX tree with Linus' tree
Hi Sascha,
Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/Makefile between commit 95b8f20fd6a2694a16b8addb190b942bfb670c88
("ARM: fix badly placed mach/plat entries in Kconfig & Makefile") from
Linus' tree and commit b996b5830364c1b1d2469be574f4ebe831987ba9 ("mxc:
Add support for the Babbage board (i.MX5)") from the i.MX tree.
I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc arch/arm/Makefile
index c7f6f41,056daf8..0000000
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -146,7 -146,7 +146,8 @@@ machine-$(CONFIG_ARCH_MX1) := mx
machine-$(CONFIG_ARCH_MX2) := mx2
machine-$(CONFIG_ARCH_MX25) := mx25
machine-$(CONFIG_ARCH_MX3) := mx3
+ machine-$(CONFIG_ARCH_MX5) := mx5
+machine-$(CONFIG_ARCH_MXC91231) := mxc91231
machine-$(CONFIG_ARCH_NETX) := netx
machine-$(CONFIG_ARCH_NOMADIK) := nomadik
machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx
--
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