From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Herbert Xu <herbert@gondor•apana.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Horia Geanta <horia.geanta@freescale•com>,
Marek Vasut <marex@denx•de>
Subject: linux-next: manual merge of the crypto tree with the crypto-current tree
Date: Fri, 9 May 2014 12:01:40 +1000 [thread overview]
Message-ID: <20140509120140.4314dd63@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2014-05-09 2:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140509120140.4314dd63@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=horia.geanta@freescale$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marex@denx$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox