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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index d7d2223d404203fc8e817248c0719d2cc205056e,3ad4c3c979180713e91d6b491013e73d3b0f5fe0..835b5f100e926e54bab4be7802aeada4af37a145
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -5,9 -5,10 +5,11 @@@ config AR
        select ARCH_32BIT_OFF_T
        select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND
        select ARCH_HAS_BINFMT_FLAT
 +      select ARCH_HAS_CACHE_LINE_SIZE if OF
        select ARCH_HAS_CPU_CACHE_ALIASING
        select ARCH_HAS_CPU_FINALIZE_INIT if MMU
+       select ARCH_HAS_CRC32 if KERNEL_MODE_NEON
+       select ARCH_HAS_CRC_T10DIF if KERNEL_MODE_NEON
        select ARCH_HAS_CURRENT_STACK_POINTER
        select ARCH_HAS_DEBUG_VIRTUAL if MMU
        select ARCH_HAS_DMA_ALLOC if MMU

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

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

diff --cc arch/loongarch/Kconfig
Simple merge

diff --cc arch/loongarch/configs/loongson3_defconfig
Simple merge

diff --cc arch/m68k/configs/amiga_defconfig
Simple merge

diff --cc arch/m68k/configs/apollo_defconfig
Simple merge

diff --cc arch/m68k/configs/atari_defconfig
Simple merge

diff --cc arch/m68k/configs/bvme6000_defconfig
Simple merge

diff --cc arch/m68k/configs/hp300_defconfig
Simple merge

diff --cc arch/m68k/configs/mac_defconfig
Simple merge

diff --cc arch/m68k/configs/multi_defconfig
Simple merge

diff --cc arch/m68k/configs/mvme147_defconfig
Simple merge

diff --cc arch/m68k/configs/mvme16x_defconfig
Simple merge

diff --cc arch/m68k/configs/q40_defconfig
Simple merge

diff --cc arch/m68k/configs/sun3_defconfig
Simple merge

diff --cc arch/m68k/configs/sun3x_defconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

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

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/s390/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 crypto/Kconfig
Simple merge

diff --cc crypto/Makefile
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc fs/bcachefs/Kconfig
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/f2fs/f2fs.h
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge