| commit | f8d221d2e0e1572d0d60174c118e3554d1aa79fa | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Sat Jun 01 00:49:02 2019 +0200 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Sat Jun 01 00:49:02 2019 +0200 |
| tree | 1e8fab4978cd5d241d8657c8de9d22278e4b8aed | |
| parent | 24e8a2ca1f74574ad2ed1ac7af0260dd90fd911e [diff] | |
| parent | a86cb413f4bf273a9d341a3ab2c2ca44e12eb317 [diff] |
Merge tag 'kvm-s390-master-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master KVM: s390: Fixes - fix compilation for !CONFIG_PCI - fix the output of KVM_CAP_MAX_VCPU_ID