Paolo, Radim, some fixes for the new vfio-ap features. This was added on top of the apv11 branch and merged again. So whenever we have a conflict via Martins tree he can merge this topic branch as well. (As of today no such conflict). Please pull. The following changes since commit 55d09dd4c86060fbbc74ab2b1bfaed401cd0163a: Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext (2018-10-01 08:53:23 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-next-4.20-2 for you to fetch changes up to ed3054a3025879c7d3f64de7a58b7f6427e0d3a0: Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext (2018-10-08 12:14:54 +0200) ---------------------------------------------------------------- KVM: s390/vfio-ap: Fixes and enhancements for vfio-ap - add tracing - fix a locking bug - make local functions and data static ---------------------------------------------------------------- Christian Borntraeger (3): KVM: s390: fix locking for crypto setting error path s390: vfio-ap: make local functions and data static Merge branch 'apv11' of git://git.kernel.org/.../kvms390/linux into kernelorgnext Pierre Morel (2): KVM: s390: Tracing APCB changes s390: vfio-ap: setup APCB mask using KVM dedicated function arch/s390/include/asm/kvm_host.h | 2 ++ arch/s390/kvm/kvm-s390.c | 57 ++++++++++++++++++++++++++++++++++++--- drivers/s390/crypto/vfio_ap_drv.c | 4 +-- drivers/s390/crypto/vfio_ap_ops.c | 55 +++++++++---------------------------- 4 files changed, 70 insertions(+), 48 deletions(-)