KVM: s390: Fixups for changes in merge window for 4.0
Here are some fixups/improvements for
commit
c56ab52b42c ("KVM: s390: add cpu model support")
commit
3105572f7e4 ("KVM: s390: use facilities and cpu_id per KVM")
commit
400e9762fdb ("KVM: s390/cpacf: Enable/disable protected key
functions for kvm guest")
commit
0a6ea691442 ("KVM: s390/CPACF: Choose crypto control block format")
which all have been merged during the merge window for 4.0.