Subject: RE: linux-next: manual merge of the s5p tree with Linus' tree

From: Kukjin Kim <[email-masked]>
Date: Tue, 24 Jan 2012 21:27:17 +0900

Stephen Rothwell wrote:
> Hi Kukjin,
Hi Stephen,

> Today's linux-next merge of the s5p tree got a conflict in
> arch/arm/mach-exynos/cpu.c between commit cc511b8d84d8 ("ARM: 7257/1:
> EXYNOS: introduce arch/arm/mach-exynos/common.[ch]") from Linus' tree and
> commit 566fcbb817fb ("ARM: EXYNOS: Add DMC1 and allow PPMU access for
> DMC") from the s5p tree.
> 
> The former removes this file, so the latter patch now needs to be applied
> to arch/arm/mach-exynos/common.c (I think).
> 
Yes, right. Let me fix it. Thanks.

> Maybe the s5p tree should be rebased onto v3.3-rc1 (or merged with it)
> since there are other conflicts as well due to duplicated patches (same
> patch different commit).

Yes, let me rebase my tree onto v3.3-rc1 and then will merge other branches for v3.4 ;)

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email-masked]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.