]> Gentwo Git Trees - linux/.git/commitdiff
Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Jan 2025 06:17:00 +0000 (17:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 Jan 2025 06:17:00 +0000 (17:17 +1100)
35 files changed:
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/configs/multi_v7_defconfig
arch/arm64/Kconfig
arch/arm64/configs/defconfig
arch/loongarch/Kconfig
arch/loongarch/configs/loongson3_defconfig
arch/m68k/configs/amiga_defconfig
arch/m68k/configs/apollo_defconfig
arch/m68k/configs/atari_defconfig
arch/m68k/configs/bvme6000_defconfig
arch/m68k/configs/hp300_defconfig
arch/m68k/configs/mac_defconfig
arch/m68k/configs/multi_defconfig
arch/m68k/configs/mvme147_defconfig
arch/m68k/configs/mvme16x_defconfig
arch/m68k/configs/q40_defconfig
arch/m68k/configs/sun3_defconfig
arch/m68k/configs/sun3x_defconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/powerpc/configs/ppc64_defconfig
arch/riscv/Kconfig
arch/s390/Kconfig
arch/s390/configs/debug_defconfig
arch/s390/configs/defconfig
arch/x86/Kconfig
crypto/Kconfig
crypto/Makefile
drivers/target/iscsi/iscsi_target.c
fs/bcachefs/Kconfig
fs/ext4/super.c
fs/f2fs/f2fs.h
lib/Kconfig.debug
lib/Makefile

diff --cc MAINTAINERS
Simple merge
index d7d2223d404203fc8e817248c0719d2cc205056e,3ad4c3c979180713e91d6b491013e73d3b0f5fe0..835b5f100e926e54bab4be7802aeada4af37a145
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc crypto/Kconfig
Simple merge
diff --cc crypto/Makefile
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/super.c
Simple merge
diff --cc fs/f2fs/f2fs.h
Simple merge
Simple merge
diff --cc lib/Makefile
Simple merge