| commit | 04a7ea04d508b925e7f829305b358157d58b4f82 | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Fri Jun 30 12:38:26 2017 +0200 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Fri Jun 30 12:38:26 2017 +0200 |
| tree | d75fb98c733277ba35986046103595c3cb79c39b | |
| parent | c853354429f7ec88f9cdde4e46e69a2c0e3c8310 [diff] | |
| parent | d38338e396ee0571b3502962fd2fbaec4d2d9a8f [diff] |
Merge tag 'kvmarm-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD KVM/ARM updates for 4.13 - vcpu request overhaul - allow timer and PMU to have their interrupt number selected from userspace - workaround for Cavium erratum 30115 - handling of memory poisonning - the usual crop of fixes and cleanups Conflicts: arch/s390/include/asm/kvm_host.h