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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

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,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

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.

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

diff --cc arch/s390/include/asm/kvm_host.h
index 9bf95bb30f1a,734d302ba389..000000000000
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@@ -106,9 -107,9 +107,11 @@@ struct kvm_s390_sie_block 
        __u64   gbea;                   /* 0x0180 */
        __u8    reserved188[24];        /* 0x0188 */
        __u32   fac;                    /* 0x01a0 */
 -      __u8    reserved1a4[58];        /* 0x01a4 */
 +      __u8    reserved1a4[20];        /* 0x01a4 */
 +      __u64   cbrlo;                  /* 0x01b8 */
-       __u8    reserved1c0[40];        /* 0x01c0 */
++      __u8    reserved1c0[30];        /* 0x01c0 */
+       __u64   pp;                     /* 0x01de */
+       __u8    reserved1e6[2];         /* 0x01e6 */
        __u64   itdba;                  /* 0x01e8 */
        __u8    reserved1f0[16];        /* 0x01f0 */
  } __attribute__((packed));


[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]