Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 31 May 2019 22:49:02 +0000 (00:49 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 31 May 2019 22:49:02 +0000 (00:49 +0200)
KVM: s390: Fixes

- fix compilation for !CONFIG_PCI
- fix the output of KVM_CAP_MAX_VCPU_ID


Trivial merge