Merge branch 'kvm-arm64/pmu-5.9' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 29 Sep 2020 14:12:54 +0000 (15:12 +0100)
committerMarc Zyngier <maz@kernel.org>
Tue, 29 Sep 2020 14:12:54 +0000 (15:12 +0100)
commit2e02cbb236d6ac12e04629f94b7032a94f968165
treecc4c6ceb1528b8dff66ab10dee045e370c77de05
parent41fa0f597150f2ae01ae264a70126f44e783bdc7
parent51dd2eb98c72c1ff4cdb1526fff9a259a563c257
Merge branch 'kvm-arm64/pmu-5.9' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/kvm_host.h
arch/arm64/kvm/arm.c