diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2015-12-09 10:51:12 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-12-08 21:55:49 -0500 |
| commit | 8ac2837c89c8c0fcad557e4380aeef80580390f9 (patch) | |
| tree | 9fc34a91680351c4bb706a663516b7e79c44978d /drivers/vhost/Kconfig | |
| parent | bc0b8b66e0be6c30186551876e525a304c59b342 (diff) | |
| download | linux-8ac2837c89c8c0fcad557e4380aeef80580390f9.tar.bz2 | |
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>
Diffstat (limited to 'drivers/vhost/Kconfig')
| -rw-r--r-- | drivers/vhost/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index 81449bfc8d3b..533eaf04f12f 100644 --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig @@ -47,7 +47,3 @@ config VHOST_CROSS_ENDIAN_LEGACY adds some overhead, it is disabled by default. If unsure, say "N". - -if STAGING -source "drivers/vhost/Kconfig.vsock" -endif |