]> 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)
commitf54bfb685db7ece33d396a6a1ce1c4f71debd8ac
tree9fc34a91680351c4bb706a663516b7e79c44978d
parenta436745a3c9937291f174adb42cd30e6b0e95766
Revert "Merge branch 'vsock-virtio'"

This reverts commit cb02e6ad8404953abfbbdc1ca10ba443543e4249 and merge
commit 864879ae8edbf0b28a1ebe50dce42031742da0f5, reversing changes made
to 85da7b39a3f8a8c72c921feb0fbd351b58d360e5.

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]