]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'kvmarm-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 30 Jun 2017 10:38:26 +0000 (12:38 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 30 Jun 2017 10:38:26 +0000 (12:38 +0200)
commitb3894eb04b8245233cd4e7117e16f2f1da347d76
treed75fb98c733277ba35986046103595c3cb79c39b
parent503460c90fb09691bbfae0fc6e275b2da85d678e
parentd4905f2bf7ed0a43299aea2d117313352f002785
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
arch/arm64/include/asm/kvm_host.h
arch/powerpc/kvm/powerpc.c
arch/s390/include/asm/kvm_host.h
arch/s390/kvm/kvm-s390.c
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/x86.c