linux-next: manual merge of the vhost tree with the net-next tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jason Wang <jasowang@redhat.com>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Subject: linux-next: manual merge of the vhost tree with the net-next tree
Date: Thu, 19 Apr 2012 15:35:47 +1000	[thread overview]
Message-ID: <20120419153547.c9e4cf4865b28c61668a2be1@canb.auug.org.au> (raw)

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

Hi Michael,

Today's linux-next merge of the vhost tree got a conflict in
drivers/net/virtio_net.c between commit 586d17c5a01b ("virtio-net: send
gratuitous packets when needed") from the net-next tree and commit
66fdfb7bc203 ("virtio-net: remove useless disable on freeze") from the
vhost tree.

Just context changes.  I fixed it up (I think - see below) and can carry
the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/virtio_net.c
index fa58c78,3e4767f..0000000

--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -1224,16 -1183,6 +1224,11 @@@ static int virtnet_freeze(struct virtio
  {
  	struct virtnet_info *vi = vdev->priv;
  
 +	/* Prevent config work handler from accessing the device */
 +	mutex_lock(&vi->config_lock);
 +	vi->config_enable = false;
 +	mutex_unlock(&vi->config_lock);
 +
- 	virtqueue_disable_cb(vi->rvq);
- 	virtqueue_disable_cb(vi->svq);
- 	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
- 		virtqueue_disable_cb(vi->cvq);
- 
  	netif_device_detach(vi->dev);
  	cancel_delayed_work_sync(&vi->refill);
  

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