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

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/crypto/ahash.c b/crypto/ahash.c
index 5fc1f172963d..3887a98abcc3 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -69,8 +69,9 @@ static int hash_walk_new_entry(struct crypto_hash_walk *walk)
         struct scatterlist *sg;
 
         sg = walk->sg;
-        walk->pg = sg_page(sg);
         walk->offset = sg->offset;
+        walk->pg = sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
+        walk->offset = offset_in_page(walk->offset);
         walk->entrylen = sg->length;
 
         if (walk->entrylen > walk->total)