lkml.org 
[lkml]   [2013]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the trivial tree with the crypto tree
Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/crypto/ux500/hash/hash_core.c between commit 69d2884debaa
("crypto: ux500 - Fix logging, make arrays const, neatening") from the
crypto tree and commit 0b1587b18bfe ("treewide: Fix typo in printk") from
the trivial tree.

I fixed it up (the former is a superset of the latter, so I used that)
and can carry the fix as necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-08-21 06:21    [W:0.025 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site