Merge tag 'kvm-s390-next-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Sat, 13 Oct 2018 10:00:26 +0000 (12:00 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Sat, 13 Oct 2018 10:00:26 +0000 (12:00 +0200)
commit3d0d0d9b1d805e39456a9d49443d847092cb21ab
tree6e99cda54e3db2f9ce039ac3d1269de2a81cc818
parent7dd2157cb61a38bee83e3bc4f9bc3311f7053b4b
parented3054a3025879c7d3f64de7a58b7f6427e0d3a0
Merge tag 'kvm-s390-next-4.20-2' of git://git./linux/kernel/git/kvms390/linux into HEAD

KVM: s390/vfio-ap: Fixes and enhancements for vfio-ap

- add tracing
- fix a locking bug
- make local functions and data static
arch/s390/kvm/kvm-s390.c