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@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature
