linux-kernel - 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-next>] [day] [month] [year] [list]

Date:	Tue, 24 Jan 2012 13:21:23 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	MyungJoo Ham <myungjoo.ham@...sung.com>,
	Kyungmin Park <kyungmin.park@...sung.com>
Subject: linux-next: manual merge of the s5p tree with Linus' tree

Hi Kukjin,

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).

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).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped