]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD
authorMarc Zyngier <marc.zyngier@arm.com>
Mon, 19 Mar 2018 17:43:01 +0000 (17:43 +0000)
committerMarc Zyngier <marc.zyngier@arm.com>
Mon, 19 Mar 2018 17:43:01 +0000 (17:43 +0000)
commit5fbb0df6f68e31a586b947433e93ba9654c8080f
tree65e68ad352e17318d009e5f69bde535c79b8c3e7
parent4b472ffd1513407ee3607b8e638e8695e9b487ca
parent27e91ad1e746e341ca2312f29bccb9736be7b476
Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD

Resolve conflicts with current mainline
arch/arm/kvm/hyp/Makefile
include/kvm/arm_vgic.h
virt/kvm/arm/arch_timer.c
virt/kvm/arm/hyp/vgic-v3-sr.c
virt/kvm/arm/vgic/vgic-v2.c
virt/kvm/arm/vgic/vgic-v3.c
virt/kvm/arm/vgic/vgic.c
virt/kvm/arm/vgic/vgic.h