Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: restrict RDMA usage
This commit is contained in:
Linus Torvalds 2008-11-15 11:39:09 -08:00
commit 4d41e12166

View File

@ -13,22 +13,24 @@ menuconfig NET_9P
If unsure, say N.
if NET_9P
config NET_9P_VIRTIO
depends on NET_9P && EXPERIMENTAL && VIRTIO
depends on EXPERIMENTAL && VIRTIO
tristate "9P Virtio Transport (Experimental)"
help
This builds support for a transports between
guest partitions and a host partition.
config NET_9P_RDMA
depends on NET_9P && INFINIBAND && EXPERIMENTAL
depends on INET && INFINIBAND && EXPERIMENTAL
tristate "9P RDMA Transport (Experimental)"
help
This builds support for a RDMA transport.
This builds support for an RDMA transport.
config NET_9P_DEBUG
bool "Debug information"
depends on NET_9P
help
Say Y if you want the 9P subsystem to log debug information.
endif