Merge tag 'v6.17-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "API:
   - Allow hash drivers without fallbacks (e.g., hardware key)

  Algorithms:
   - Add hmac hardware key support (phmac) on s390
   - Re-enable sha384 in FIPS mode
   - Disable sha1 in FIPS mode
   - Convert zstd to acomp

  Drivers:
   - Lower priority of qat skcipher and aead
   - Convert aspeed to partial block API
   - Add iMX8QXP support in caam
   - Add rate limiting support for GEN6 devices in qat
   - Enable telemetry for GEN6 devices in qat
   - Implement full backlog mode for hisilicon/sec2"

* tag 'v6.17-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (116 commits)
  crypto: keembay - Use min() to simplify ocs_create_linked_list_from_sg()
  crypto: hisilicon/hpre - fix dma unmap sequence
  crypto: qat - make adf_dev_autoreset() static
  crypto: ccp - reduce stack usage in ccp_run_aes_gcm_cmd
  crypto: qat - refactor ring-related debug functions
  crypto: qat - fix seq_file position update in adf_ring_next()
  crypto: qat - fix DMA direction for compression on GEN2 devices
  crypto: jitter - replace ARRAY_SIZE definition with header include
  crypto: engine - remove {prepare,unprepare}_crypt_hardware callbacks
  crypto: engine - remove request batching support
  crypto: qat - flush misc workqueue during device shutdown
  crypto: qat - enable rate limiting feature for GEN6 devices
  crypto: qat - add compression slice count for rate limiting
  crypto: qat - add get_svc_slice_cnt() in device data structure
  crypto: qat - add adf_rl_get_num_svc_aes() in rate limiting
  crypto: qat - relocate service related functions
  crypto: qat - consolidate service enums
  crypto: qat - add decompression service for rate limiting
  crypto: qat - validate service in rate limiting sysfs api
  crypto: hisilicon/sec2 - implement full backlog mode for sec
  ...

diff --cc arch/s390/configs/debug_defconfig
Simple merge

diff --cc arch/s390/configs/defconfig
Simple merge

diff --cc arch/s390/crypto/Makefile
Simple merge

diff --cc crypto/ahash.c
Simple merge

diff --cc crypto/testmgr.c
index d636e04b55d5ca2d3f22dcfb811cd80c49094afd,97190d9dcc0eec68bcd5a14f6daf0d92f3b50cce..ee33ba21ae2bc0b7a7b44d1461aedab33c289fba
--- 1/crypto/testmgr.c
--- 2/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@@ -4184,9 -4228,7 +4184,8 @@@ static const struct alg_test_desc alg_t
                }
        }, {
                .alg = "authenc(hmac(sha1),cbc(aes))",
 +              .generic_driver = "authenc(hmac-sha1-lib,cbc(aes-generic))",
                .test = alg_test_aead,
-               .fips_allowed = 1,
                .suite = {
                        .aead = __VECS(hmac_sha1_aes_cbc_tv_temp)
                }
@@@ -4207,10 -4247,8 +4206,9 @@@
        }, {
                .alg = "authenc(hmac(sha1),ctr(aes))",
                .test = alg_test_null,
-               .fips_allowed = 1,
        }, {
                .alg = "authenc(hmac(sha1),ecb(cipher_null))",
 +              .generic_driver = "authenc(hmac-sha1-lib,ecb-cipher_null)",
                .test = alg_test_aead,
                .suite = {
                        .aead = __VECS(hmac_sha1_ecb_cipher_null_tv_temp)
@@@ -4218,10 -4256,8 +4216,9 @@@
        }, {
                .alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
                .test = alg_test_null,
-               .fips_allowed = 1,
        }, {
                .alg = "authenc(hmac(sha224),cbc(des))",
 +              .generic_driver = "authenc(hmac-sha224-lib,cbc(des-generic))",
                .test = alg_test_aead,
                .suite = {
                        .aead = __VECS(hmac_sha224_des_cbc_tv_temp)
@@@ -5075,9 -5100,7 +5076,8 @@@
                }
        }, {
                .alg = "hmac(sha1)",
 +              .generic_driver = "hmac-sha1-lib",
                .test = alg_test_hash,
-               .fips_allowed = 1,
                .suite = {
                        .hash = __VECS(hmac_sha1_tv_template)
                }
@@@ -5416,9 -5465,7 +5446,8 @@@
                }
        }, {
                .alg = "sha1",
 +              .generic_driver = "sha1-lib",
                .test = alg_test_hash,
-               .fips_allowed = 1,
                .suite = {
                        .hash = __VECS(sha1_tv_template)
                }

diff --cc drivers/crypto/img-hash.c
Simple merge

diff --cc drivers/crypto/inside-secure/safexcel_hash.c
Simple merge

diff --cc drivers/crypto/intel/qat/qat_common/qat_algs.c
Simple merge

diff --cc drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
Simple merge

diff --cc drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c
Simple merge