projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bc0b8b6) | patch
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)
commit8ac2837c89c8c0fcad557e4380aeef80580390f9
tree9fc34a91680351c4bb706a663516b7e79c44978dtree | snapshot
parentbc0b8b66e0be6c30186551876e525a304c59b342commit | diff
Revert "Merge branch 'vsock-virtio'"

This reverts commit 0d76d6e8b2507983a2cae4c09880798079007421 and merge
commit c402293bd76fbc93e52ef8c0947ab81eea3ae019, reversing changes made
to c89359a42e2a49656451569c382eed63e781153c.

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 diff | blob | history
drivers/vhost/Kconfig.vsock [deleted file] blob | history
drivers/vhost/Makefile diff | blob | history
drivers/vhost/vsock.c [deleted file] blob | history
drivers/vhost/vsock.h [deleted file] blob | history
include/linux/virtio_vsock.h [deleted file] blob | history
include/net/af_vsock.h diff | blob | history
include/uapi/linux/virtio_ids.h diff | blob | history
include/uapi/linux/virtio_vsock.h [deleted file] blob | history
net/vmw_vsock/Kconfig diff | blob | history
net/vmw_vsock/Makefile diff | blob | history
net/vmw_vsock/af_vsock.c diff | blob | history
net/vmw_vsock/virtio_transport.c [deleted file] blob | history
net/vmw_vsock/virtio_transport_common.c [deleted file] blob | history
John Crispins staging tree