Commit 8dac3410 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 93cc7c7f ("KVM: arm64: Eagerly switch ZCR_EL{1,2}") into android14-5.15-lts



Steps on the way to 5.15.181

Resolves merge conflicts in:
	arch/arm64/include/asm/fpsimd.h
	arch/arm64/include/asm/kvm_host.h
	arch/arm64/include/asm/kvm_hyp.h
	arch/arm64/include/asm/processor.h
	arch/arm64/kernel/fpsimd.c
	arch/arm64/kernel/process.c
	arch/arm64/kernel/ptrace.c
	arch/arm64/kernel/signal.c
	arch/arm64/kvm/fpsimd.c
	arch/arm64/kvm/hyp/include/hyp/switch.h
	arch/arm64/kvm/hyp/nvhe/hyp-main.c
	arch/arm64/kvm/hyp/nvhe/switch.c
	arch/arm64/kvm/reset.c

by merging away the following upstream commits due to the massive merge
conflicts:
	c18ebc95bc43 Merge 93cc7c7f ("KVM: arm64: Eagerly switch ZCR_EL{1,2}") into android13-5.15-lts
	93cc7c7f KVM: arm64: Eagerly switch ZCR_EL{1,2}
	ec3efc04 KVM: arm64: Calculate cptr_el2 traps on activating traps
	52a473ba KVM: arm64: Remove VHE host restore of CPACR_EL1.ZEN
	08ce0d1e KVM: arm64: Remove host FPSIMD saving for non-protected KVM
	5289ac43 KVM: arm64: Unconditionally save+flush host FPSIMD/SVE/SME state
	978c0ccf arm64/fpsimd: Stop using TIF_SVE to manage register saving in KVM
	6b3d37c9 arm64/fpsimd: Have KVM explicitly say which FP registers to save
	8be8ba9c arm64/fpsimd: Track the saved FPSIMD state type separately to TIF_SVE
	c4ab60a8 KVM: arm64: Discard any SVE state when entering KVM guests
	58ed9301 KVM: arm64: Always start with clearing SVE flag on load
	a2231da3 KVM: arm64: Get rid of host SVE tracking/saving

Change-Id: I200b5385cc1b1e25bd0b97d978db7326aaa00a7a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0416edb7 93cc7c7f
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment