From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jan 2025 16:50:19 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=816cef980d816bdb1b3121a5c406df839a85d7f5;p=users%2Fwilly%2Fpagecache.git

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux

Pull ARM updates from Russell King:

 - fix typos in vfpmodule.c

 - drop obsolete VFP accessor fallback for old assemblers

 - add cache line identifier register accessor functions

 - add cacheinfo support

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9440/1: cacheinfo fix format field mask
  ARM: 9433/2: implement cacheinfo support
  ARM: 9432/2: add CLIDR accessor functions
  ARM: 9438/1: assembler: Drop obsolete VFP accessor fallback
  ARM: 9437/1: vfp: Fix typographical errors in vfpmodule.c
---

816cef980d816bdb1b3121a5c406df839a85d7f5
diff --cc arch/arm/Kconfig
index 3ad4c3c979180,d7d2223d40420..835b5f100e926
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -5,10 -5,9 +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