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	86bb80d3d4188d9df06a03091b94842ea300e0b5
tree	bc19ab13a760684d96e6e61121d5a978e1fae2b6	tree \| snapshot
parent	2911ed20f7cce15bc9404f5bd031ce024c68982c	commit \| diff
parent	8cf75ef54f8171b7345c3aa2d14b75f441332858	commit \| diff

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