summaryrefslogtreecommitdiffstats
path: root/drivers/vfio/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-02 13:29:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-02 13:29:14 -0700
commite95893004104054d49406fd108fefa3ddc054366 (patch)
tree9bf38e91f4767d9842ba32839eda28a1ac1a971a /drivers/vfio/pci
parent5a148af66932c31814e263366094b5812210b501 (diff)
parent181c04a357bb791587c55a99362c2fdde2c64f18 (diff)
downloadlinux-e95893004104054d49406fd108fefa3ddc054366.tar.gz
linux-e95893004104054d49406fd108fefa3ddc054366.tar.bz2
linux-e95893004104054d49406fd108fefa3ddc054366.zip
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull vhost cleanups and fixes from Michael Tsirkin: "Here are vhost cleanups and fixes by Asias He and myself. They affect both vhost-net and vhost-scsi devices. They also *depend* on both net-next and target-pending, where the net and target commits these changes depend on are already merged. So merging through the common vhost tree." * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: vhost_scsi: module rename tcm_vhost: header split up vhost: src file renames vhost: fix error handling in RESET_OWNER ioctl tcm_vhost: remove virtio-net.h dependency vhost: move per-vq net specific fields out to net tcm_vhost: document inflight ref-counting use vhost: move vhost-net zerocopy fields to net.c tcm_vhost: Wait for pending requests in vhost_scsi_flush() vhost: Allow device specific fields per vq
Diffstat (limited to 'drivers/vfio/pci')
0 files changed, 0 insertions, 0 deletions