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

Conflicts:
	drivers/net/virtio_net.c

diff --cc arch/x86/kernel/apic/apic_numachip.c
Simple merge

diff --cc arch/x86/kernel/apic/x2apic_phys.c
Simple merge

diff --cc drivers/net/virtio_net.c
index fa58c7869954482fc021cb201cc60b21b2bf1cf4,3e4767f0656cba27f47712b3b02749e9efc2a50e..020e3b76393ba55261abd8587bda4a6107f8baaf
--- 1/drivers/net/virtio_net.c
--- 2/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;
  
-       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);
- 
 +      /* Prevent config work handler from accessing the device */
 +      mutex_lock(&vi->config_lock);
 +      vi->config_enable = false;
 +      mutex_unlock(&vi->config_lock);
 +
        netif_device_detach(vi->dev);
        cancel_delayed_work_sync(&vi->refill);