I also need to rename the ioctls and do more testing, but this is probably what you want? Christian Borntraeger (2): lock changes merge vm/cpu create arch/s390/kvm/intercept.c | 6 +-- arch/s390/kvm/interrupt.c | 35 ++++++++++------- arch/s390/kvm/kvm-s390.c | 83 +++++++++++++++++++++++++-------------- arch/s390/kvm/kvm-s390.h | 18 ++++++--- arch/s390/kvm/priv.c | 4 +- 5 files changed, 92 insertions(+), 54 deletions(-) -- 2.25.0