Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/configs/mpc885_ads_defconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/crypto/aesni-intel_glue.c
index 82225fe50ec12d7b6d00a48a0f70484f2f915424,3e9ab5cdade47ff80cec4d298015d20dd2716dd2..b59480ea97dc95621b271b3c2654c0bcb457fa68
--- 1/arch/x86/crypto/aesni-intel_glue.c
--- 2/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@@ -1624,11 -1580,10 +1604,11 @@@ static int __init register_avx_algs(voi
        if (err)
                return err;
  
-       if (x86_match_cpu(zmm_exclusion_list)) {
+       if (boot_cpu_has(X86_FEATURE_PREFER_YMM)) {
                int i;
  
 -              aes_xts_alg_vaes_avx10_512.base.cra_priority = 1;
 +              for (i = 0; i < ARRAY_SIZE(skcipher_algs_vaes_avx10_512); i++)
 +                      skcipher_algs_vaes_avx10_512[i].base.cra_priority = 1;
                for (i = 0; i < ARRAY_SIZE(aes_gcm_algs_vaes_avx10_512); i++)
                        aes_gcm_algs_vaes_avx10_512[i].base.cra_priority = 1;
        }

diff --cc crypto/tcrypt.c
Simple merge

diff --cc crypto/testmgr.c
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc lib/tests/crc_kunit.c
Simple merge