Subject: linux-next: manual merge of the crypto tree with the crypto-current tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 May 2014 12:01:40 +1000

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in
drivers/crypto/caam/error.c between commit 27c5fb7a8424 ("crypto: caam
- add allocation failure handling in SPRINTFCAT macro") from the
crypto-current tree and commit e22cdcfa13d9 ("crypto: caam - Kill
SPRINTFCAT() with fire") from the crypto tree.

I fixed it up (I removed the SPRINTFCAT macro) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]