From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 14 Dec 2021 18:11:52 +0000 (+0000)
Subject: Merge 'arm64/for-next/fixes' into for-next/bti
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=580b536b504fb13bea6e19e399e207e7253ca30a;p=linux.git

Merge 'arm64/for-next/fixes' into for-next/bti

Needed for the arch/arm64/kernel/entry-ftrace.S fix.

* commit 'arm64/for-next/fixes^^':
  arm64: ftrace: add missing BTIs
  arm64: kexec: use __pa_symbol(empty_zero_page)
  arm64: update PAC description for kernel
---

580b536b504fb13bea6e19e399e207e7253ca30a