• L
    Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 846ade7d
    Linus Torvalds 提交于
    Pull virtio/vhost updates from Michael Tsirkin:
     "virtio, vhost: fixes, cleanups, features
    
      This includes the disk/cache memory stats for for the virtio balloon,
      as well as multiple fixes and cleanups"
    
    * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
      vhost: don't hold onto file pointer for VHOST_SET_LOG_FD
      vhost: don't hold onto file pointer for VHOST_SET_VRING_ERR
      vhost: don't hold onto file pointer for VHOST_SET_VRING_CALL
      ringtest: ring.c malloc & memset to calloc
      virtio_vop: don't kfree device on register failure
      virtio_pci: don't kfree device on register failure
      virtio: split device_register into device_initialize and device_add
      vhost: remove unused lock check flag in vhost_dev_cleanup()
      vhost: Remove the unused variable.
      virtio_blk: print capacity at probe time
      virtio: make VIRTIO a menuconfig to ease disabling it all
      virtio/ringtest: virtio_ring: fix up need_event math
      virtio/ringtest: fix up need_event math
      virtio: virtio_mmio: make of_device_ids const.
      firmware: Use PTR_ERR_OR_ZERO()
      virtio-mmio: Use PTR_ERR_OR_ZERO()
      vhost/scsi: Improve a size determination in four functions
      virtio_balloon: include disk/file caches memory statistics
    846ade7d
net.c 34.4 KB