]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'kvm-arm-for-3.19-take2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 15 Dec 2014 12:06:40 +0000 (13:06 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 15 Dec 2014 12:06:40 +0000 (13:06 +0100)
commitd88ce17b4ab8429dcce4d797e0a4af3685ec43fc
tree7a171a51d9a999f90dd6f17f2b7dd0997dbc1a38
parent04133c65b9e65d0be57592f15318e5c91a786a40
parent6432e6b1492627e10b656a82efa906cf4e55c034
Merge tag 'kvm-arm-for-3.19-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

Second round of changes for KVM for arm/arm64 for v3.19; fixes reboot
problems, clarifies VCPU init, and fixes a regression concerning the
VGIC init flow.

Conflicts:
arch/ia64/kvm/kvm-ia64.c [deleted in HEAD and modified in kvmarm]
Documentation/virtual/kvm/api.txt
arch/x86/kvm/mmu.c
include/linux/kvm_host.h
virt/kvm/kvm_main.c