Merge tag 'kvm-arm-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 9 Mar 2016 10:50:42 +0000 (11:50 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 9 Mar 2016 10:50:42 +0000 (11:50 +0100)
commitab92f30875a7ec3e84644a5494febd8901e66742
tree5254eb36b20b0d1c584c15d0bf3d6a5a9c1bb451
parentbb9eadf0c35f2e7eb5ca6468f46ebb7473b85537
parentb40c4892d175874d118860c8282a85ee7b64bcbb
Merge tag 'kvm-arm-for-4.6' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/ARM updates for 4.6

- VHE support so that we can run the kernel at EL2 on ARMv8.1 systems
- PMU support for guests
- 32bit world switch rewritten in C
- Various optimizations to the vgic save/restore code

Conflicts:
include/uapi/linux/kvm.h
Documentation/virtual/kvm/api.txt
arch/x86/kvm/paging_tmpl.h
include/uapi/linux/kvm.h
virt/kvm/async_pf.c