o Merge with Linux 2.1.100.

 o Cleanup the machine dependencies of floppy and rtc.  The driver for
   the Dallas thingy in the Indy is still missing.
 o Handle allocation of zero'd pages correct for R4000SC / R4400SC.
 o Page colouring shit to match the virtual and physical colour of all
   mapped pages.  This tends to produce extreme fragmentation problems,
   so it's deactivated for now.  Users of R4000SC / R4400SC may re-enable
   the code in arch/mips/mm/init.c by removing the definition of
   CONF_GIVE_A_SHIT_ABOUT_COLOURS.  Should get them somewhat further -
   but don't shake to hard ...
 o Fixed ptrace(2)-ing of syscalls, strace is now working again.
 o Fix the interrupt forwarding from the keyboard driver to the psaux
   driver, PS/2 mice are now working on the Indy.  The fix is somewhat
   broken as it prevents generic kernels for Indy and machines which handle
   things different.
 o Things I can't remember.

1 files changed, 6 insertions, 5 deletions

diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index 7f75f4770..9dfe8dc27 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -10,7 +10,6 @@ pages of code to determine what is expected when writing a filesystem.
 Hopefully this helps anyone attempting such a feat, as well as clearing up
 a few important points/dependencies.
 
-
 register_filesystem (struct file_system_type *fstype)
 =====================================================
 
@@ -133,10 +132,12 @@ struct inode_operations
 
 	int (*follow_link) (struct inode *,struct inode *,int,int,struct inode **);
 	[optional]
-		The follow_link function is only necessary if a filesystem uses a really
-		twisted form of symbolic links - namely if the symbolic link comes from a
-		foreign filesystem that makes no sense....
-		I threw this one out - too much redundant code!
+		follow_link must be implemented if readlink is implemented.
+		Note that follow_link can return a different inode than a
+		lookup_dentry() on the result of readlink() would return.
+		The proc filesystem, in particular, uses this feature heavily.
+		For most user filesystems, however, follow_link() and readlink()
+		should return consistent results.
 
 	int (*readpage) (struct inode *, struct page *);	[optional]
 	int (*writepage) (struct inode *, struct page *);	[mandatory with readpage]