linux-kernel - linux-next: manual merge of the crypto tree with the omap 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: <20100927143300.9fa73063.sfr@canb.auug.org.au>
Date:	Mon, 27 Sep 2010 14:33:00 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Herbert Xu <herbert@...dor.apana.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dmitry Kasatkin <dmitry.kasatkin@...ia.com>,
	Tony Lindgren <tony@...mide.com>, <linux-omap@...r.kernel.org>
Subject: linux-next: manual merge of the crypto tree with the omap tree

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
arch/arm/mach-omap2/devices.c between commit
5d14f2792f9d63c5d25903bd048017c4b53c7d9a ("omap: crypto: updates to
enable omap aes") from the omap tree and commit
b744c679f62b368cb94c21c1dcd4618e42d88d63 ("crypto: updates to enable omap
aes") from the crypto tree.

Two versions of the same patch.  The version in the omap tree has been
updated, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped