diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2021-12-14 18:11:52 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2021-12-14 18:11:52 +0000 |
| commit | 580b536b504fb13bea6e19e399e207e7253ca30a (patch) | |
| tree | 6f8f0d3bafd40c186bad31a9afb07f8789aa9c89 /include/linux/fpga/fpga-mgr.h | |
| parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
| parent | 35b6b28e69985eafb20b3b2c7bd6eca452b56b53 (diff) | |
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
Diffstat (limited to 'include/linux/fpga/fpga-mgr.h')
0 files changed, 0 insertions, 0 deletions