]> git.baikalelectronics.ru Git - 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)
commitbdd53b70ca6d48ca84a96c17bdbb30aba8895dc7
tree65e68ad352e17318d009e5f69bde535c79b8c3e7
parente504d9dea976aab55eb0bd7a93b69b8e6601365d
parent2d99a33373b348c97a41b0f2389b918082095dfc
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