diff options
| author | Marc Zyngier <maz@kernel.org> | 2025-01-06 17:48:19 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2025-01-11 14:55:18 +0000 |
| commit | 4e26de25d2b617e12bba98e11393fdf7c27885f9 (patch) | |
| tree | 340998354de94bbf26cd697601fa7e124f0dbdf7 /arch/arm64/include/asm/kvm_pkvm.h | |
| parent | b7f345fbc32afab0f0b03c71c7eaf48b9a0ad7ed (diff) | |
| parent | e5ecedcd7cc231a115c11cfed79635583ef4f882 (diff) | |
Merge remote-tracking branch 'arm64/for-next/cpufeature' into kvm-arm64/pkvm-fixed-features-6.14
Merge arm64/for-next/cpufeature to solve extensive conflicts
caused by the CPACR_ELx->CPACR_EL1 repainting.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_pkvm.h')
0 files changed, 0 insertions, 0 deletions