Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2022 19:46:41 +0000 (13:46 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2022 19:46:41 +0000 (13:46 -0600)
commit77856d911a8c8724ee8e2b09d55979fc1de8f1c0
treee895658d3ec29c6892ec20412765698c39ab3aa9
parentaa4800e31c547ed00681318335ca2298c4bca33a
parentc0cd1d541704c45030cbb2031612fdd68e8e15d5
Merge tag 'arm64-fixes' of git://git./linux/kernel/git/arm64/linux

Pull arm64 fixes from Will Deacon:

 - Fix Kconfig dependencies to re-allow the enabling of function graph
   tracer and shadow call stacks at the same time.

 - Revert the workaround for CPU erratum #2645198 since the CONFIG_
   guards were incorrect and the code has therefore not seen any real
   exposure in -next.

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption"
  ftrace: Allow WITH_ARGS flavour of graph tracer with shadow call stack
arch/Kconfig
arch/arm64/Kconfig
arch/arm64/include/asm/pgtable.h
arch/arm64/mm/mmu.c