From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Fri, 21 Sep 2018 05:22:37 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.20-rc1~116^2~97
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=910e3ca10bba726d10a865b279d98bf8fbf12cf4;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge crypto-2.6 to resolve caam conflict with skcipher conversion.
---

910e3ca10bba726d10a865b279d98bf8fbf12cf4
diff --cc drivers/crypto/caam/caamalg.c
index 8152c6319c57,ec40f991e6c6..2f9f803bb1c4
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@@ -1493,8 -1553,9 +1493,8 @@@ static struct skcipher_edesc *skcipher_
  	edesc->src_nents = src_nents;
  	edesc->dst_nents = dst_nents;
  	edesc->sec4_sg_bytes = sec4_sg_bytes;
- 	edesc->sec4_sg = (void *)edesc + sizeof(struct skcipher_edesc) +
- 			 desc_bytes;
+ 	edesc->sec4_sg = (struct sec4_sg_entry *)((u8 *)edesc->hw_desc +
+ 						  desc_bytes);
 -	edesc->iv_dir = DMA_TO_DEVICE;
  
  	/* Make sure IV is located in a DMAable area */
  	iv = (u8 *)edesc->hw_desc + desc_bytes + sec4_sg_bytes;