linux-kernel - linux-next: manual merge of the arm-current 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]

Message-Id: <20120113114951.7b7f131514437454e5682aa8@canb.auug.org.au>
Date:	Fri, 13 Jan 2012 11:49:51 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arnd Bergmann <arnd@...db.de>
Subject: linux-next: manual merge of the arm-current tree with Linus' tree

Hi Russell,

Today's linux-next merge of the arm-current tree got a conflict in
arch/arm/mach-exynos/common.c between (I think) commit 237c78beb8a9
("Merge branch 'depends/rmk/for-linus' into samsung/dt") from Linus' tree
and commit 588ac27d3419 ("ARM: 7273/1: EXYNOS: Fix build error which was
from common.c and old cpu.c") from the arm-current tree.

So this arm-current fi is superceded by the merge above that is now in
Linus' tree.

I fixed it up by ignoring the arm-current version.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped