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

Pull virtio/vhost updates from Michael Tsirkin:
 "New features, performance improvements, cleanups:

   - basic polling support for vhost
   - rework virtio to optionally use DMA API, fixing it on Xen
   - balloon stats gained a new entry
   - using the new napi_alloc_skb speeds up virtio net
   - virtio blk stats can now be read while another VCPU is busy
     inflating or deflating the balloon

  plus misc cleanups in various places"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_net: replace netdev_alloc_skb_ip_align() with napi_alloc_skb()
  vhost_net: basic polling support
  vhost: introduce vhost_vq_avail_empty()
  vhost: introduce vhost_has_work()
  virtio_balloon: Allow to resize and update the balloon stats in parallel
  virtio_balloon: Use a workqueue instead of "vballoon" kthread
  virtio/s390: size of SET_IND payload
  virtio/s390: use dev_to_virtio
  vhost: rename vhost_init_used()
  vhost: rename cross-endian helpers
  virtio_blk: VIRTIO_BLK_F_WCE->VIRTIO_BLK_F_FLUSH
  vring: Use the DMA API on Xen
  virtio_pci: Use the DMA API if enabled
  virtio_mmio: Use the DMA API if enabled
  virtio: Add improved queue allocation API
  virtio_ring: Support DMA APIs
  vring: Introduce vring_use_dma_api()
  s390/dma: Allow per device dma ops
  alpha/dma: use common noop dma ops
  dma: Provide simple noop dma ops

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/pci/pci.c
index 9fd59a7cfcd3c31133bac69b6e62ffbf0a9654ed,b63265a7f178852c9de469b9c912c3533cfdb246..871af75c69c24cd1a7c59c0feb9c43124efaf5c6
--- 1/arch/s390/pci/pci.c
--- 2/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@@ -640,7 -640,10 +640,8 @@@ int pcibios_add_device(struct pci_dev *
        struct resource *res;
        int i;
  
 -      zdev->pdev = pdev;
        pdev->dev.groups = zpci_attr_groups;
+       pdev->dev.archdata.dma_ops = &s390_pci_dma_ops;
        zpci_map_resources(pdev);
  
        for (i = 0; i < PCI_BAR_COUNT; i++) {

diff --cc arch/s390/pci/pci_dma.c
Simple merge

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/virtio/virtio_balloon.c
Simple merge

diff --cc include/linux/dma-mapping.h
Simple merge

diff --cc lib/Makefile
Simple merge