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

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-id: <02e501ccda93$82af3570$880da050$%kim@samsung.com>
Date:	Tue, 24 Jan 2012 21:27:17 +0900
From:	Kukjin Kim <kgene.kim@...sung.com>
To:	'Stephen Rothwell' <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	'MyungJoo Ham' <myungjoo.ham@...sung.com>,
	'Kyungmin Park' <kyungmin.park@...sung.com>
Subject: RE: linux-next: manual merge of the s5p tree with Linus' tree

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 <kgene.kim@...sung.com>, 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/