Messages in this thread | | | Date | Wed, 6 Feb 2013 13:45:57 +0800 | From | Herbert Xu <> | Subject | Re: linux-next: manual merge of the crypto tree with the net-next tree |
| |
On Wed, Feb 06, 2013 at 01:20:11PM +1100, Stephen Rothwell wrote: > Hi Herbert, > > Today's linux-next merge of the crypto tree got a conflict in > crypto/ctr.c between commit 69d3150cfc20 ("crypto: ctr - make rfc3686 > asynchronous block cipher") from the net-next tree and commit > 3e8afe35c36f ("crypto: use ERR_CAST") from the crypto tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good. Thanks Stephen! -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
| |