linux-kernel - linux-next: manual merge of the samsung 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: <20091208111722.2e8d9527.sfr@canb.auug.org.au>
Date:	Tue, 8 Dec 2009 11:17:22 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ben Dooks <ben-linux@...ff.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the samsung tree

Hi Ben,

In today's linux-next merge of the samsung tree I noticed that the file
arch/arm/plat-s3c/dev-hsmmc2.c actually has some merge conflict artifacts
in it.

I fixed them up (just by using the version from the arm tree) but it
would be good if this could be fixed in your tree as well (I notice that
Russell has already merged a (presumable) correct version of these files).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped