---

yaml
---
r: 4899
b: refs/heads/master
c: 9d853c3
h: refs/heads/master
i:
  4897: 790e0d9
  4895: 7580815
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ed1383fb7b6685968588141d5934e0e6715e954
+refs/heads/master: 9d853c3757ef74ded5ae564d68370f22208fb88b

trunk/Documentation/dontdiff

@@ -41,7 +41,6 @@ COPYING
 CREDITS
 CVS
 ChangeSet
-Image
 Kerntypes
 MODS.txt
 Module.symvers
@@ -104,7 +103,6 @@ logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
-mach-types.h
 make_times_h
 map
 maui_boot.h

trunk/Documentation/feature-removal-schedule.txt

@@ -103,11 +103,11 @@ Who:	Jody McIntyre <scjody@steamballoon.com>
 ---------------------------
 
 What:	register_serial/unregister_serial
-When:	September 2005
+When:	December 2005
 Why:	This interface does not allow serial ports to be registered against
 	a struct device, and as such does not allow correct power management
 	of such ports.  8250-based ports should use serial8250_register_port
-	and serial8250_unregister_port, or platform devices instead.
+	and serial8250_unregister_port instead.
 Who:	Russell King <rmk@arm.linux.org.uk>
 
 ---------------------------

trunk/Documentation/filesystems/inotify.txt

@@ -1,22 +1,18 @@
-				   inotify
-	    a powerful yet simple file change notification system
+				    inotify
+	     a powerful yet simple file change notification system
 
 
 
 Document started 15 Mar 2005 by Robert Love <rml@novell.com>
 
-
 (i) User Interface
 
-Inotify is controlled by a set of three system calls and normal file I/O on a
-returned file descriptor.
+Inotify is controlled by a set of three sys calls 
 
-First step in using inotify is to initialise an inotify instance:
+First step in using inotify is to initialise an inotify instance
 
 	int fd = inotify_init ();
 
-Each instance is associated with a unique, ordered queue.
-
 Change events are managed by "watches".  A watch is an (object,mask) pair where
 the object is a file or directory and the mask is a bit mask of one or more
 inotify events that the application wishes to receive.  See <linux/inotify.h>
@@ -26,60 +22,51 @@ Watches are added via a path to the file.
 
 Watches on a directory will return events on any files inside of the directory.
 
-Adding a watch is simple:
+Adding a watch is simple,
 
 	int wd = inotify_add_watch (fd, path, mask);
 
-Where "fd" is the return value from inotify_init(), path is the path to the
-object to watch, and mask is the watch mask (see <linux/inotify.h>).
+You can add a large number of files via something like
+
+	for each file to watch {
+		int wd = inotify_add_watch (fd, file, mask);
+	}
 
 You can update an existing watch in the same manner, by passing in a new mask.
 
-An existing watch is removed via
+An existing watch is removed via the INOTIFY_IGNORE ioctl, for example
 
-	int ret = inotify_rm_watch (fd, wd);
+	inotify_rm_watch (fd, wd);
 
 Events are provided in the form of an inotify_event structure that is read(2)
-from a given inotify instance.  The filename is of dynamic length and follows
-the struct. It is of size len.  The filename is padded with null bytes to
-ensure proper alignment.  This padding is reflected in len.
+from a inotify instance fd.  The filename is of dynamic length and follows the 
+struct. It is of size len.  The filename is padded with null bytes to ensure 
+proper alignment.  This padding is reflected in len.
 
 You can slurp multiple events by passing a large buffer, for example
 
 	size_t len = read (fd, buf, BUF_LEN);
 
-Where "buf" is a pointer to an array of "inotify_event" structures at least
-BUF_LEN bytes in size.  The above example will return as many events as are
-available and fit in BUF_LEN.
+Will return as many events as are available and fit in BUF_LEN.
 
-Each inotify instance fd is also select()- and poll()-able.
+each inotify instance fd is also select()- and poll()-able.
 
-You can find the size of the current event queue via the standard FIONREAD
-ioctl on the fd returned by inotify_init().
+You can find the size of the current event queue via the FIONREAD ioctl.
 
 All watches are destroyed and cleaned up on close.
 
 
-(ii)
-
-Prototypes:
-
-	int inotify_init (void);
-	int inotify_add_watch (int fd, const char *path, __u32 mask);
-	int inotify_rm_watch (int fd, __u32 mask);
-
+(ii) Internal Kernel Implementation
 
-(iii) Internal Kernel Implementation
-
-Each inotify instance is associated with an inotify_device structure.
+Each open inotify instance is associated with an inotify_device structure.
 
 Each watch is associated with an inotify_watch structure.  Watches are chained
 off of each associated device and each associated inode.
 
 See fs/inotify.c for the locking and lifetime rules.
 
 
-(iv) Rationale
+(iii) Rationale
 
 Q: What is the design decision behind not tying the watch to the open fd of
    the watched object?
@@ -88,9 +75,9 @@ A: Watches are associated with an open inotify device, not an open file.
    This solves the primary problem with dnotify: keeping the file open pins
    the file and thus, worse, pins the mount.  Dnotify is therefore infeasible
    for use on a desktop system with removable media as the media cannot be
-   unmounted.  Watching a file should not require that it be open.
+   unmounted.
 
-Q: What is the design decision behind using an-fd-per-instance as opposed to
+Q: What is the design decision behind using an-fd-per-device as opposed to
    an fd-per-watch?
 
 A: An fd-per-watch quickly consumes more file descriptors than are allowed,
@@ -99,8 +86,8 @@ A: An fd-per-watch quickly consumes more file descriptors than are allowed,
    can use epoll, but requiring both is a silly and extraneous requirement.
    A watch consumes less memory than an open file, separating the number
    spaces is thus sensible.  The current design is what user-space developers
-   want: Users initialize inotify, once, and add n watches, requiring but one
-   fd and no twiddling with fd limits.  Initializing an inotify instance two
+   want: Users initialize inotify, once, and add n watches, requiring but one fd
+   and no twiddling with fd limits.  Initializing an inotify instance two
    thousand times is silly.  If we can implement user-space's preferences 
    cleanly--and we can, the idr layer makes stuff like this trivial--then we 
    should.
@@ -124,6 +111,9 @@ A: An fd-per-watch quickly consumes more file descriptors than are allowed,
      example, love it.  Trust me, I asked.  It is not a surprise: Who'd want
      to manage and block on 1000 fd's via select?
 
+   - You'd have to manage the fd's, as an example: Call close() when you
+     received a delete event.
+
    - No way to get out of band data.
 
    - 1024 is still too low.  ;-)
@@ -132,11 +122,6 @@ A: An fd-per-watch quickly consumes more file descriptors than are allowed,
    scales to 1000s of directories, juggling 1000s of fd's just does not seem
    the right interface.  It is too heavy.
 
-   Additionally, it _is_ possible to  more than one instance  and
-   juggle more than one queue and thus more than one associated fd.  There
-   need not be a one-fd-per-process mapping; it is one-fd-per-queue and a
-   process can easily want more than one queue.
-
 Q: Why the system call approach?
 
 A: The poor user-space interface is the second biggest problem with dnotify.
@@ -146,6 +131,8 @@ A: The poor user-space interface is the second biggest problem with dnotify.
    Obtaining the fd and managing the watches could have been done either via a
    device file or a family of new system calls.  We decided to implement a
    family of system calls because that is the preffered approach for new kernel
-   interfaces.  The only real difference was whether we wanted to use open(2)
-   and ioctl(2) or a couple of new system calls.  System calls beat ioctls.
+   features and it means our user interface requirements.
+
+   Additionally, it _is_ possible to  more than one instance  and
+   juggle more than one queue and thus more than one associated fd.
 

trunk/Documentation/filesystems/ntfs.txt

@@ -21,7 +21,7 @@ Overview
 ========
 
 Linux-NTFS comes with a number of user-space programs known as ntfsprogs.
-These include mkntfs, a full-featured ntfs filesystem format utility,
+These include mkntfs, a full-featured ntfs file system format utility,
 ntfsundelete used for recovering files that were unintentionally deleted
 from an NTFS volume and ntfsresize which is used to resize an NTFS partition.
 See the web site for more information.
@@ -149,14 +149,7 @@ case_sensitive=<BOOL>	If case_sensitive is specified, treat all file names as
 			name, if it exists.  If case_sensitive, you will need
 			to provide the correct case of the short file name.
 
-disable_sparse=<BOOL>	If disable_sparse is specified, creation of sparse
-			regions, i.e. holes, inside files is disabled for the
-			volume (for the duration of this mount only).  By
-			default, creation of sparse regions is enabled, which
-			is consistent with the behaviour of traditional Unix
-			filesystems.
-
-errors=opt		What to do when critical filesystem errors are found.
+errors=opt		What to do when critical file system errors are found.
 			Following values can be used for "opt":
 			  continue: DEFAULT, try to clean-up as much as
 				    possible, e.g. marking a corrupt inode as
@@ -439,24 +432,6 @@ ChangeLog
 
 Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
 
-2.1.23:
-	- Stamp the user space journal, aka transaction log, aka $UsnJrnl, if
-	  it is present and active thus telling Windows and applications using
-	  the transaction log that changes can have happened on the volume
-	  which are not recorded in $UsnJrnl.
-	- Detect the case when Windows has been hibernated (suspended to disk)
-	  and if this is the case do not allow (re)mounting read-write to
-	  prevent data corruption when you boot back into the suspended
-	  Windows session.
-	- Implement extension of resident files using the normal file write
-	  code paths, i.e. most very small files can be extended to be a little
-	  bit bigger but not by much.
-	- Add new mount option "disable_sparse".  (See list of mount options
-	  above for details.)
-	- Improve handling of ntfs volumes with errors and strange boot sectors
-	  in particular.
-	- Fix various bugs including a nasty deadlock that appeared in recent
-	  kernels (around 2.6.11-2.6.12 timeframe).
 2.1.22:
 	- Improve handling of ntfs volumes with errors.
 	- Fix various bugs and race conditions.

trunk/MAINTAINERS

@@ -1169,12 +1169,6 @@ L:	linux-input@atrey.karlin.mff.cuni.cz
 L:	linux-joystick@atrey.karlin.mff.cuni.cz
 S:	Maintained
 
-INOTIFY
-P:	John McCutchan and Robert Love
-M:	ttb@tentacle.dhs.org and rml@novell.com
-L:	linux-kernel@vger.kernel.org
-S:	Maintained
-
 INTEL 810/815 FRAMEBUFFER DRIVER
 P:      Antonino Daplas
 M:      adaplas@pol.net