git.baikalelectronics.ru Git - kernel.git/commit

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

Pull virtio/vhost updates from Michael Tsirkin:
"Features, fixes, cleanups:

   - discard in virtio blk

   - misc fixes and cleanups"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: correct the related warning message
  vhost: split structs into a separate header file
  virtio: remove deprecated VIRTIO_PCI_CONFIG()
  vhost/vsock: switch to a mutex for vhost_vsock_hash
  virtio_blk: add discard and write zeroes support

author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 3 Jan 2019 02:54:45 +0000 (18:54 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 3 Jan 2019 02:54:45 +0000 (18:54 -0800)
commit	ba5f9df636d5c89fe941c1eb2fc4f1af2fc788d5
tree	bc19ab13a760684d96e6e61121d5a978e1fae2b6	tree \| snapshot
parent	44e25ed0ddf064d7e06c8baafbe52c11485ad843	commit \| diff
parent	68de6b7783a0fcc2d3b848bff8f8b502dc295263	commit \| diff

drivers/block/virtio_blk.c	diff1 \|	diff2 \|	blob \| history
drivers/vhost/scsi.c	diff1 \|	diff2 \|	blob \| history