From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 13 Jun 2016 11:44:50 +0000 (+0200)
Subject: Merge tag 'kvm-s390-master-4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-5.0.0-8.9~7014^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c1b8bfb08f25d1cb9ef2bc93229107113a41ad8c;p=mirror_ubuntu-disco-kernel.git

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
---

c1b8bfb08f25d1cb9ef2bc93229107113a41ad8c