]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae8bd85 a071261)
Merge branch 'kvm-arm64/nvhe-hyp-context' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Wed, 16 Sep 2020 09:59:17 +0000 (10:59 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 16 Sep 2020 09:59:17 +0000 (10:59 +0100)
Signed-off-by: Marc Zyngier <maz@kernel.org>
1  2 
arch/arm64/include/asm/kvm_host.h patch | diff1 | diff2 | blob | history
arch/arm64/kvm/arm.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/include/asm/kvm_host.h
Simple merge
diff --cc arch/arm64/kvm/arm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.