Merge 'arm64/for-next/fixes' into for-next/bti
authorCatalin Marinas <catalin.marinas@arm.com>
Tue, 14 Dec 2021 18:11:52 +0000 (18:11 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 14 Dec 2021 18:11:52 +0000 (18:11 +0000)
commit580b536b504fb13bea6e19e399e207e7253ca30a
tree6f8f0d3bafd40c186bad31a9afb07f8789aa9c89
parentd58071a8a76d779eedab38033ae4c821c30295a5
parent35b6b28e69985eafb20b3b2c7bd6eca452b56b53
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