]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
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


Trivial merge