linux-next: manual merge of the kvm tree with the tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in arch/s390/include/asm/kvm_host.h between commit b31288fa83b2b ("s390/kvm: support collaborative memory management") from the tree and commit 672550fb682e993 ("KVM: s390: Provide access to program parameter") from the kvm tree.

linux-next: manual merge of the kvm tree with the tree

Hi all, Today's linux-next merge of the kvm tree got a conflict in drivers/s390/kvm/virtio_ccw.c between commit 9d0ca6ed6f2f ("virtio: remove obsolete virtqueue_get_queue_index()") from the net-next tree and commit 07e169335ff0 ("virtio_ccw: pass a cookie value to kvm hypercall") from the kvm tree