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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130325133233.0ae2af5bf7e25dca9c3999ba@canb.auug.org.au>
Date:	Mon, 25 Mar 2013 13:32:33 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rusty Russell <rusty@...tcorp.com.au>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	"Michael S. Tsirkin" <mst@...hat.com>,
	Cornelia Huck <cornelia.huck@...ibm.com>
Subject: 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.

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

-- 
Cheers,
Stephen Rothwell                    sfr@...b.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,

Content of type "application/pgp-signature" skipped