Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

Conflicts:
	block/blk-core.c
	drivers/block/loop.c
	mm/swapfile.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/crypto/ahash.c b/crypto/ahash.c
index b8c59b889c6e..f669822a7a44 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -47,8 +47,11 @@ static int hash_walk_next(struct crypto_hash_walk *walk)
         walk->data = crypto_kmap(walk->pg, 0);
         walk->data += offset;
 
-        if (offset & alignmask)
-                nbytes = alignmask + 1 - (offset & alignmask);
+        if (offset & alignmask) {
+                unsigned int unaligned = alignmask + 1 - (offset & alignmask);
+                if (nbytes > unaligned)
+                        nbytes = unaligned;
+        }
 
         walk->entrylen -= nbytes;
         return nbytes;