RE: linux-next: manual merge of the s5p tree with the arm tree
From: Kukjin Kim
Date: Wed Dec 28 2011 - 03:33:44 EST
Stephen Rothwell wrote:
> Hi Kukjin,
> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-s5p64x0/init.c between commit 95af214becab ("ARM: 7246/1:
> S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]") from the arm tree
> and commit afba7f91e640 ("ARM: SAMSUNG: remove struct
> 's3c24xx_uart_clksrc' and all uses of it") from the s5p tree.
> I just removed the file, but the latter patch will probably need applying
> in some form to arch/arm/mach-s5p64x0/common.c.
OK, let me fix it.
Thanks for your time :)
Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/