Merge tag 'kvm-s390-master-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 8 Jun 2017 14:35:18 +0000 (16:35 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 8 Jun 2017 14:35:18 +0000 (16:35 +0200)
commit9e53932d888b7f32475db72f859f8f38cc2135fb
tree8a3da8df28b51ef3c604b8b24a5f9eb669dd3078
parenta3641631d14571242eec0d30c9faa786cbf52d44
parent1ba15b24f07c44f68067959522639226c963e212
Merge tag 'kvm-s390-master-4.12-1' of git://git./linux/kernel/git/kvms390/linux into HEAD

KVM: s390: Fix for master (4.12)

- The newly created AIS capability enables the feature unconditionally
  and ignores the cpu model