From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 21 Jan 2025 06:17:00 +0000 (+1100)
Subject: Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers... 
X-Git-Tag: next-20250121~2
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=9ef057dea651f06ac5b4b930036cf97b9f6e4552;p=linux%2F.git

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

9ef057dea651f06ac5b4b930036cf97b9f6e4552
diff --cc arch/arm/Kconfig
index d7d2223d4042,3ad4c3c97918..835b5f100e92
--- a/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