From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2026 15:47:13 +0000 (-0700)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: v7.0-rc7~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=441c63ff42c4e666304cdd32d23b5fc6bc1ea3cc;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fix from Will Deacon:

 - Implement a basic static call trampoline to fix CFI failures with the
   generic implementation

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Use static call trampolines when kCFI is enabled
---

441c63ff42c4e666304cdd32d23b5fc6bc1ea3cc