---

yaml
---
r: 16671
b: refs/heads/master
c: 2e3e13f
h: refs/heads/master
i:
  16669: 0646765
  16667: 151e156
  16663: 0a6c2ab
  16655: 52a9f1f
  16639: 2936ac8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66
+refs/heads/master: 2e3e13f8e9d9b2111404cdccaa4e1b988b70acce

trunk/.gitignore

@@ -10,7 +10,6 @@
 *.a
 *.s
 *.ko
-*.so
 *.mod.c
 
 #

trunk/Documentation/block/biodoc.txt

@@ -263,8 +263,14 @@ A flag in the bio structure, BIO_BARRIER is used to identify a barrier i/o.
 The generic i/o scheduler would make sure that it places the barrier request and
 all other requests coming after it after all the previous requests in the
 queue. Barriers may be implemented in different ways depending on the
-driver. For more details regarding I/O barriers, please read barrier.txt
-in this directory.
+driver. A SCSI driver for example could make use of ordered tags to
+preserve the necessary ordering with a lower impact on throughput. For IDE
+this might be two sync cache flush: a pre and post flush when encountering
+a barrier write.
+
+There is a provision for queues to indicate what kind of barriers they
+can provide. This is as of yet unmerged, details will be added here once it
+is in the kernel.
 
 1.2.2 Request Priority/Latency
 

trunk/Documentation/feature-removal-schedule.txt

@@ -47,6 +47,17 @@ Who:	Paul E. McKenney <paulmck@us.ibm.com>
 
 ---------------------------
 
+What:	IEEE1394 Audio and Music Data Transmission Protocol driver,
+	Connection Management Procedures driver
+When:	November 2005
+Files:	drivers/ieee1394/{amdtp,cmp}*
+Why:	These are incomplete, have never worked, and are better implemented
+	in userland via raw1394 (see http://freebob.sourceforge.net/ for
+	example.)
+Who:	Jody McIntyre <scjody@steamballoon.com>
+
+---------------------------
+
 What:	raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN
 When:	November 2005
 Why:	Deprecated in favour of the new ioctl-based rawiso interface, which is

trunk/Documentation/filesystems/00-INDEX

@@ -12,14 +12,10 @@ cifs.txt
 	- description of the CIFS filesystem
 coda.txt
 	- description of the CODA filesystem.
-configfs/
-	- directory containing configfs documentation and example code.
 cramfs.txt
 	- info on the cram filesystem for small storage (ROMs etc)
 devfs/
 	- directory containing devfs documentation.
-dlmfs.txt
-	- info on the userspace interface to the OCFS2 DLM.
 ext2.txt
 	- info, mount options and specifications for the Ext2 filesystem.
 hpfs.txt
@@ -34,8 +30,6 @@ ntfs.txt
 	- info and mount options for the NTFS filesystem (Windows NT).
 proc.txt
 	- info on Linux's /proc filesystem.
-ocfs2.txt
-	- info and mount options for the OCFS2 clustered filesystem.
 romfs.txt
 	- Description of the ROMFS filesystem.
 smbfs.txt