Merge tag 'kvmarm-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm...
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 21 Nov 2019 08:58:35 +0000 (09:58 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 21 Nov 2019 08:58:35 +0000 (09:58 +0100)
commit14edff88315add29099fd8eebb9ef989c2e47c18
tree79408381811a642d451744957a52830f84f1f643
parent992edeaefed682511bd173dabd2f54b1ce5387df
parentcd7056ae34af0e9424da97bbc7d2b38246ba8a2c
Merge tag 'kvmarm-5.5' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for Linux 5.5:

- Allow non-ISV data aborts to be reported to userspace
- Allow injection of data aborts from userspace
- Expose stolen time to guests
- GICv4 performance improvements
- vgic ITS emulation fixes
- Simplify FWB handling
- Enable halt pool counters
- Make the emulated timer PREEMPT_RT compliant

Conflicts:
include/uapi/linux/kvm.h
Documentation/virt/kvm/api.txt
arch/arm64/kernel/cpu_errata.c
include/linux/kvm_host.h
include/uapi/linux/kvm.h
virt/kvm/kvm_main.c