]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'arm64/for-next/cpufeature' into kvm-arm64/pkvm-fixed...
authorMarc Zyngier <maz@kernel.org>
Mon, 6 Jan 2025 17:48:19 +0000 (17:48 +0000)
committerMarc Zyngier <maz@kernel.org>
Sat, 11 Jan 2025 14:55:18 +0000 (14:55 +0000)
commit4e26de25d2b617e12bba98e11393fdf7c27885f9
tree340998354de94bbf26cd697601fa7e124f0dbdf7
parentb7f345fbc32afab0f0b03c71c7eaf48b9a0ad7ed
parente5ecedcd7cc231a115c11cfed79635583ef4f882
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>
arch/arm64/include/asm/el2_setup.h
arch/arm64/include/asm/kvm_arm.h
arch/arm64/include/asm/kvm_emulate.h
arch/arm64/kvm/at.c
arch/arm64/kvm/hyp/nvhe/switch.c