Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 2 deletions

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index b4ffc5be1a93..e5b5721809e2 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -277,12 +277,12 @@ static int ablkcipher_walk_first(struct ablkcipher_request *req,
         if (WARN_ON_ONCE(in_irq()))
                 return -EDEADLK;
 
+        walk->iv = req->info;
         walk->nbytes = walk->total;
         if (unlikely(!walk->total))
                 return 0;
 
         walk->iv_buffer = NULL;
-        walk->iv = req->info;
         if (unlikely(((unsigned long)walk->iv & alignmask))) {
                 int err = ablkcipher_copy_iv(walk, tfm, alignmask);
 
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 11b981492031..8cc1622b2ee0 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -326,12 +326,12 @@ static int blkcipher_walk_first(struct blkcipher_desc *desc,
         if (WARN_ON_ONCE(in_irq()))
                 return -EDEADLK;
 
+        walk->iv = desc->info;
         walk->nbytes = walk->total;
         if (unlikely(!walk->total))
                 return 0;
 
         walk->buffer = NULL;
-        walk->iv = desc->info;
         if (unlikely(((unsigned long)walk->iv & walk->alignmask))) {
                 int err = blkcipher_copy_iv(walk);
                 if (err)