diff --git a/[refs] b/[refs] index 945a02e218a5..68a6d37942e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d47a35600270e7115061cb1320ee60ae9bcb6b8 +refs/heads/master: 3211e4eb5834924dd5beac8956c0bc0bfb755c37 diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig index 3bf6ace1720c..d7312825592b 100644 --- a/trunk/fs/Kconfig +++ b/trunk/fs/Kconfig @@ -1778,12 +1778,9 @@ config SUNRPC_GSS tristate config SUNRPC_XPRT_RDMA - tristate "RDMA transport for sunrpc (EXPERIMENTAL)" + tristate depends on SUNRPC && INFINIBAND && EXPERIMENTAL - default m - help - Adds a client RPC transport for supporting kernel NFS over RDMA - mounts, including Infiniband and iWARP. Experimental. + default SUNRPC && INFINIBAND config SUNRPC_BIND34 bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"