Merge branch 'master' into next

1 files changed, 5 insertions, 1 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 28a45a1e6f42..c3c9124209a1 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -53,7 +53,7 @@ static char *check[] = {
         "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
         "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta",  "fcrypt",
         "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320",
-        "lzo", "cts", NULL
+        "lzo", "cts", "zlib", NULL
 };
 
 static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc,
@@ -661,6 +661,10 @@ static void do_test(int m)
                 tcrypt_test("ecb(seed)");
                 break;
 
+        case 44:
+                tcrypt_test("zlib");
+                break;
+
         case 100:
                 tcrypt_test("hmac(md5)");
                 break;