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.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/s390/kvm/virtio_ccw.c
index fb877b59,42d507c..0000000

--- a/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,