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

# Conflicts:
#	drivers/virtio/virtio.c
#	include/uapi/linux/virtio_ids.h

diff --cc drivers/vdpa/mlx5/net/mlx5_vnet.c
Simple merge

diff --cc drivers/virtio/virtio.c
index 1ea0c1f6a1fd7ce8fea6f7ffa6f5fd16606cbd08,c46cc1fbc7aedef205d0653d8f40e848bdafc143..588e02fb91d378aebf222d9f7d39da4d0348e1f9
--- 1/drivers/virtio/virtio.c
--- 2/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@@ -292,6 -293,10 +293,8 @@@ static void virtio_dev_remove(struct de
  
        /* Acknowledge the device's existence again. */
        virtio_add_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
 -
 -      return 0;
+ 
+       of_node_put(dev->dev.of_node);
  }
  
  static struct bus_type virtio_bus = {