[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Tue, 10 Jan 2012 11:52:18 +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,
Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
<linux-arm-kernel@...ts.infradead.org>
Subject: linux-next: please update the i.MX tree
Hi Sascha,
It looks like most (if not all) of the i.MX tree has been merged into the
arm-soc (and Linus') tree, so could you please update the i.MX tree to
eliminate the conflicts I am getting.
CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree.
CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists