Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 17 insertions, 2 deletions

diff --git a/fs/9p/Kconfig b/fs/9p/Kconfig
index 795233702a4e..0a93dc1cb4ac 100644
--- a/fs/9p/Kconfig
+++ b/fs/9p/Kconfig
@@ -1,6 +1,6 @@
 config 9P_FS
-        tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"
-        depends on INET && NET_9P && EXPERIMENTAL
+        tristate "Plan 9 Resource Sharing Support (9P2000)"
+        depends on INET && NET_9P
         help
           If you say Y here, you will get experimental support for
           Plan 9 resource sharing via the 9P2000 protocol.
@@ -9,6 +9,7 @@ config 9P_FS
 
           If unsure, say N.
 
+if 9P_FS
 config 9P_FSCACHE
         bool "Enable 9P client caching support (EXPERIMENTAL)"
         depends on EXPERIMENTAL
@@ -17,3 +18,17 @@ config 9P_FSCACHE
           Choose Y here to enable persistent, read-only local
           caching support for 9p clients using FS-Cache
 
+
+config 9P_FS_POSIX_ACL
+        bool "9P POSIX Access Control Lists"
+        select FS_POSIX_ACL
+        help
+          POSIX Access Control Lists (ACLs) support permissions for users and
+          groups beyond the owner/group/world scheme.
+
+          To learn more about Access Control Lists, visit the POSIX ACLs for
+          Linux website <http://acl.bestbits.at/>.
+
+          If you don't know what Access Control Lists are, say N
+
+endif