]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "Merge branch 'vsock-virtio'"
authorStefan Hajnoczi <stefanha@redhat.com>
Wed, 9 Dec 2015 02:51:12 +0000 (10:51 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2015 02:55:49 +0000 (21:55 -0500)
commitb3f2244d6c0de69e609c7228db6ecee96c14fdd3
tree9fc34a91680351c4bb706a663516b7e79c44978d
parent2ebf10c62523d330198b470815810f5868990b96
Revert "Merge branch 'vsock-virtio'"

This reverts commit b711035d6936408606de3385d8cf4974cbcfb185 and merge
commit c14941b71a6ba2508f3a6c2644a0486186e63548, reversing changes made
to 8c7e46d49b6e1ac774cb82a9b97de1d9005abe6e.

The virtio-vsock device specification is not finalized yet.  Michael
Tsirkin voiced concerned about merging this code when the hardware
interface (and possibly the userspace interface) could still change.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
14 files changed:
drivers/vhost/Kconfig
drivers/vhost/Kconfig.vsock [deleted file]
drivers/vhost/Makefile
drivers/vhost/vsock.c [deleted file]
drivers/vhost/vsock.h [deleted file]
include/linux/virtio_vsock.h [deleted file]
include/net/af_vsock.h
include/uapi/linux/virtio_ids.h
include/uapi/linux/virtio_vsock.h [deleted file]
net/vmw_vsock/Kconfig
net/vmw_vsock/Makefile
net/vmw_vsock/af_vsock.c
net/vmw_vsock/virtio_transport.c [deleted file]
net/vmw_vsock/virtio_transport_common.c [deleted file]