| commit | c1b8bfb08f25d1cb9ef2bc93229107113a41ad8c | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Mon Jun 13 13:44:50 2016 +0200 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Mon Jun 13 13:44:50 2016 +0200 |
| tree | 6e8d0c0765390a6d2fda77c3bf5149208bdd9004 | |
| parent | af8c34ce6ae32addda3788d54a7e340cad22516b [diff] | |
| parent | 9ec6de19235889ab0118e970ee732cb33c9efc06 [diff] |
Merge tag 'kvm-s390-master-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD KVM: s390: fixup and missing stat 1. A fixup for a bug that was introduced in 4.7-rc1 if userspace uses the cpu model ioctls 2. Add the missing kvm stat for pei events