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

Date:	Tue, 13 Jul 2010 10:54:55 +1000
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
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/configs/s5pc110_defconfig between commit
07a8c03f3e06129e847acd068b8b89c13357ee64 ("ARM: reduce defconfigs") from
Linus' tree and commit 2976beb1dd86974ae98a992ca23a626f8be7e7dd ("ARM:
s5pv210_defconfig: Update for removing s5pc110_defconfig") from the s5p
tree.

The latter just removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped