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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/parisc/configs/generic-64bit_defconfig
Simple merge

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

diff --cc arch/riscv/Kconfig
Simple merge

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

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/crypto/aesni-intel_glue.c
index e141b7995304d637b32788dcfcec960c4e9eeea9,3e9ab5cdade47ff80cec4d298015d20dd2716dd2..bc655d794a95c22858acb2662e80b374a229271f
--- 1/arch/x86/crypto/aesni-intel_glue.c
--- 2/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@@ -1623,11 -1580,10 +1603,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 arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge

diff --cc arch/x86/lib/Makefile
Simple merge

diff --cc block/t10-pi.c
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc crypto/Makefile
index d1e422249af6446b8a69c75329b28d1ac4184df5,2f7d64eeb0080ce3a1d0bcb002fb680581660c8d..203295b15a19374db04c6667a9508eae3a491ac2
--- 1/crypto/Makefile
--- 2/crypto/Makefile
+++ b/crypto/Makefile
@@@ -155,11 -155,7 +155,8 @@@ obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_g
  obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o
  CFLAGS_crc32c_generic.o += -DARCH=$(ARCH)
  CFLAGS_crc32_generic.o += -DARCH=$(ARCH)
- obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif_generic.o
- CFLAGS_crct10dif_generic.o += -DARCH=$(ARCH)
- obj-$(CONFIG_CRYPTO_CRC64_ROCKSOFT) += crc64_rocksoft_generic.o
  obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
 +obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o
  obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o
  obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
  obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o

diff --cc crypto/tcrypt.c
Simple merge

diff --cc crypto/testmgr.c
Simple merge

diff --cc crypto/testmgr.h
Simple merge

diff --cc drivers/infiniband/sw/siw/siw.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

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