diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 21:13:52 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 21:13:52 +0400 |
| commit | eac84105cddf8686440aaa9fbcb58093e37e4180 (patch) | |
| tree | 36e247af959104ef4a055a2d9660e48b1eb56283 /arch/arm/mach-orion5x/Makefile | |
| parent | a26ea93a3d19c2b79e8b382356014eba607ce477 (diff) | |
| parent | a18cc421649dfdc21edb6c4c867dd05447d7df8c (diff) | |
| download | linux-eac84105cddf8686440aaa9fbcb58093e37e4180.tar.xz | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull more vhost fixes from Michael Tsirkin:
"This fixes some minor issues in the patches that have been merged.
We also finally drop the workaround disabling event_idx for scsi: it
was always questionable, and now we know it's not needed.
There's also a memory leak fix"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vhost-scsi: Enable VIRTIO_RING_F_EVENT_IDX
vhost: drop virtio_net.h dependency
vhost-net: Cleanup vhost_ubuf and vhost_zcopy
vhost: Remove vhost_enable_zcopy in vhost.h
vhost: Remove comments for hdr in vhost.h
vhost: Move VHOST_NET_FEATURES to net.c
vhost-net: Free ubuf when vhost_dev_set_owner fails
vhost: Export vhost_dev_set_owner
Diffstat (limited to 'arch/arm/mach-orion5x/Makefile')
0 files changed, 0 insertions, 0 deletions