diff --git a/[refs] b/[refs]
index b9cf90453379..df2a461901c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4fb0edb7c03e5ec19b6f732f1dfbe911212dbde
+refs/heads/master: 9b8e072a31180eb5cd6991d08524d9c4fa235ade
diff --git a/trunk/fs/cifs/Kconfig b/trunk/fs/cifs/Kconfig
index 53ed1ad2c112..f66cc1625150 100644
--- a/trunk/fs/cifs/Kconfig
+++ b/trunk/fs/cifs/Kconfig
@@ -156,6 +156,6 @@ config CIFS_ACL
 
 config CIFS_NFSD_EXPORT
 	  bool "Allow nfsd to export CIFS file system (EXPERIMENTAL)"
-	  depends on CIFS && EXPERIMENTAL
+	  depends on CIFS && EXPERIMENTAL && BROKEN
 	  help
 	   Allows NFS server to export a CIFS mounted share (nfsd over cifs)