Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Merge upstream tree in order to reinstate crct10dif.

1 files changed, 0 insertions, 10 deletions

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index e091ef6e1791..b7bc2e70895a 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2046,16 +2046,6 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
-                .alg = "crct10dif",
-                .test = alg_test_hash,
-                .fips_allowed = 1,
-                .suite = {
-                        .hash = {
-                                .vecs = crct10dif_tv_template,
-                                .count = CRCT10DIF_TEST_VECTORS
-                        }
-                }
-        }, {
                 .alg = "cryptd(__driver-cbc-aes-aesni)",
                 .test = alg_test_null,
                 .fips_allowed = 1,