Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin:
 "A small pull request this time around, mostly because the vduse
  network got postponed to next relase so we can be sure we got the
  security store right"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_ring: fix avail_wrap_counter in virtqueue_add_packed
  virtio_vdpa: build affinity masks conditionally
  virtio_net: merge dma operations when filling mergeable buffers
  virtio_ring: introduce dma sync api for virtqueue
  virtio_ring: introduce dma map api for virtqueue
  virtio_ring: introduce virtqueue_reset()
  virtio_ring: separate the logic of reset/enable from virtqueue_resize
  virtio_ring: correct the expression of the description of virtqueue_resize()
  virtio_ring: skip unmap for premapped
  virtio_ring: introduce virtqueue_dma_dev()
  virtio_ring: support add premapped buf
  virtio_ring: introduce virtqueue_set_dma_premapped()
  virtio_ring: put mapping error check in vring_map_one_sg
  virtio_ring: check use_dma_api before unmap desc for indirect
  vdpa_sim: offer VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK
  vdpa: add get_backend_features vdpa operation
  vdpa: accept VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK backend feature
  vdpa: add VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK flag
  vdpa/mlx5: Remove unused function declarations

diff --cc drivers/net/virtio_net.c
index 231ad91,98dc9b4..fe7f314
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -127,11 -126,14 +127,19 @@@ static const struct virtnet_stat_desc v
  #define VIRTNET_SQ_STATS_LEN  ARRAY_SIZE(virtnet_sq_stats_desc)
  #define VIRTNET_RQ_STATS_LEN  ARRAY_SIZE(virtnet_rq_stats_desc)
  
 +struct virtnet_interrupt_coalesce {
 +      u32 max_packets;
 +      u32 max_usecs;
 +};
 +
+ /* The dma information of pages allocated at a time. */
+ struct virtnet_rq_dma {
+       dma_addr_t addr;
+       u32 ref;
+       u16 len;
+       u16 need_sync;
+ };
+ 
  /* Internal representation of a send virtqueue */
  struct send_queue {
        /* Virtqueue associated with this send _queue */