From 516f37390593977c16ad84c0986a777e46630542 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Tue, 27 Sep 2005 21:45:20 -0700
Subject: [PATCH] --- yaml --- r: 9378 b: refs/heads/master c:
 909021ea7a8f4ef13af54935b87b03a20906e08a h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/Documentation/Changes | 10 ++++++++++
 trunk/fs/Kconfig            |  3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c25d83cd8547..4529df6c58e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b1f3124618b54cf125dea3a074b9cf469117723
+refs/heads/master: 909021ea7a8f4ef13af54935b87b03a20906e08a
diff --git a/trunk/Documentation/Changes b/trunk/Documentation/Changes
index 5eaab0441d76..27232be26e1a 100644
--- a/trunk/Documentation/Changes
+++ b/trunk/Documentation/Changes
@@ -237,6 +237,12 @@ udev
 udev is a userspace application for populating /dev dynamically with
 only entries for devices actually present. udev replaces devfs.
 
+FUSE
+----
+
+Needs libfuse 2.4.0 or later.  Absolute minimum is 2.3.0 but mount
+options 'direct_io' and 'kernel_cache' won't work.
+
 Networking
 ==========
 
@@ -390,6 +396,10 @@ udev
 ----
 o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>
 
+FUSE
+----
+o <http://sourceforge.net/projects/fuse>
+
 Networking
 **********
 
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 068ccea2f184..48f5422cb19a 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -472,6 +472,9 @@ config FUSE_FS
 	  utilities is available from the FUSE homepage:
 	  <http://fuse.sourceforge.net/>
 
+	  See <file:Documentation/filesystems/fuse.txt> for more information.
+	  See <file:Documentation/Changes> for needed library/utility version.
+
 	  If you want to develop a userspace FS, or if you want to use
 	  a filesystem based on FUSE, answer Y or M.