* linux-next: manual merge of the crypto tree with the crypto-current tree
@ 2014-05-09 2:01 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-05-09 2:01 UTC (permalink / raw)
To: Herbert Xu; +Cc: linux-next, linux-kernel, Horia Geanta, Marek Vasut
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
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 sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-05-09 2:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-09 2:01 linux-next: manual merge of the crypto tree with the crypto-current tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox