Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
	drivers/s390/kvm/virtio_ccw.c

diff --cc arch/arm/kvm/arm.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_pr.c
Simple merge

diff --cc drivers/s390/kvm/virtio_ccw.c
index fb877b59ec57a472e74e314a7c8afb98c245b64a,42d507c4e06bdd2bd4cf8f50e81cee5c97f04ea8..a0a91306cc2e002557cbb525c60469353b6fda64
--- 1/drivers/s390/kvm/virtio_ccw.c
--- 2/drivers/s390/kvm/virtio_ccw.c
+++ b/drivers/s390/kvm/virtio_ccw.c
@@@ -166,7 -167,8 +167,7 @@@ static void virtio_ccw_kvm_notify(struc
  
        vcdev = to_vc_device(info->vq->vdev);
        ccw_device_get_schid(vcdev->cdev, &schid);
-       do_kvm_notify(schid, vq->index);
 -      info->cookie = do_kvm_notify(schid, virtqueue_get_queue_index(vq),
 -                                   info->cookie);
++      info->cookie = do_kvm_notify(schid, vq->index, info->cookie);
  }
  
  static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev,

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge