summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kvm/hyp
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2022-12-05 14:39:12 +0000
committerMarc Zyngier <maz@kernel.org>2022-12-05 14:39:12 +0000
commit86f27d849b4713eb9ccf679b084e7d4453cbc73d (patch)
tree025e6834997a101bd01640e2d0149c3410c3a443 /arch/arm64/kvm/hyp
parent118bc846d4de5b6df1de93fa55671c15bb89853b (diff)
parente1b3253340029b06f5f648d8390807cba4e4ec23 (diff)
downloadlinux-stable-86f27d849b4713eb9ccf679b084e7d4453cbc73d.tar.gz
linux-stable-86f27d849b4713eb9ccf679b084e7d4453cbc73d.tar.bz2
linux-stable-86f27d849b4713eb9ccf679b084e7d4453cbc73d.zip
Merge branch kvm-arm64/misc-6.2 into kvmarm-master/next
* kvm-arm64/misc-6.2: : . : Misc fixes for 6.2: : : - Fix formatting for the pvtime documentation : : - Fix a comment in the VHE-specific Makefile : . KVM: arm64: Fix typo in comment KVM: arm64: Fix pvtime documentation Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp')
-rw-r--r--arch/arm64/kvm/hyp/vhe/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/vhe/Makefile b/arch/arm64/kvm/hyp/vhe/Makefile
index 96bec0ecf9dd..3b9e5464b5b3 100644
--- a/arch/arm64/kvm/hyp/vhe/Makefile
+++ b/arch/arm64/kvm/hyp/vhe/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
#
-# Makefile for Kernel-based Virtual Machine module, HYP/nVHE part
+# Makefile for Kernel-based Virtual Machine module, HYP/VHE part
#
asflags-y := -D__KVM_VHE_HYPERVISOR__