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

Merge 065e075d ("KVM: arm64: vgic-its: Add a data length check in... 


Merge 065e075d ("KVM: arm64: vgic-its: Add a data length check in vgic_its_save_*") into android14-5.15-lts

Steps on the way to 5.15.174

Resolves merge conflicts in:
	arch/arm64/kvm/vgic/vgic-its.c
	arch/arm64/kvm/vgic/vgic.h

Change-Id: I8d810c89164d749569fb00af857b915812b0e314
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 73293d62 065e075d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment