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

Merge 4118bd18 ("KVM: x86/mmu: Ensure that kvm_release_pfn_clean() takes...


Merge 4118bd18 ("KVM: x86/mmu: Ensure that kvm_release_pfn_clean() takes exact pfn from kvm_faultin_pfn()") into android14-6.1-lts

Steps on the way to 6.1.121

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

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