summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2021-12-07 09:14:53 +0000
committerMarc Zyngier <maz@kernel.org>2021-12-07 09:14:53 +0000
commit94b4a6d52173521b63b11516fe963d651dc520a4 (patch)
tree857ba45ac7bfdfd80653958048205192b7668196 /init
parent370a17f531f1736b7f17d9ac3fb8ef1013d956fd (diff)
parentf0e6e6fa41b3d2aa1dcb61dd4ed6d7be004bb5a8 (diff)
downloadlinux-94b4a6d52173521b63b11516fe963d651dc520a4.tar.bz2
Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next
* kvm-arm64/misc-5.17: : . : - Add minimal support for ARMv8.7's PMU extension : - Constify kvm_io_gic_ops : - Drop kvm_is_transparent_hugepage() prototype : . KVM: Drop stale kvm_is_transparent_hugepage() declaration KVM: arm64: Constify kvm_io_gic_ops KVM: arm64: Add minimal handling for the ARMv8.7 PMU Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions