---

yaml
---
r: 251901
b: refs/heads/master
c: eb89560
h: refs/heads/master
i:
  251899: fe6ed0e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c171acc20794af16a27da25e11ec4e9cad5d9fa
+refs/heads/master: eb8956074e7652e802be5f078080c704c2c87104

trunk/Documentation/ABI/removed/o2cb → trunk/Documentation/ABI/obsolete/o2cb

@@ -1,10 +1,11 @@
 What:		/sys/o2cb symlink
-Date:		May 2011
-KernelVersion:	2.6.40
+Date:		Dec 2005
+KernelVersion:	2.6.16
 Contact:	ocfs2-devel@oss.oracle.com
-Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
-		removed when new versions of ocfs2-tools which know to look
+Description:	This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will
+		be removed when new versions of ocfs2-tools which know to look
 		in /sys/fs/o2cb are sufficiently prevalent. Don't code new
 		software to look here, it should try /sys/fs/o2cb instead.
+		See Documentation/ABI/stable/o2cb for more information on usage.
 Users:		ocfs2-tools. It's sufficient to mail proposed changes to
 		ocfs2-devel@oss.oracle.com.

trunk/Documentation/feature-removal-schedule.txt

@@ -262,6 +262,16 @@ Who:	Michael Buesch <mb@bu3sch.de>
 
 ---------------------------
 
+What:	/sys/o2cb symlink
+When:	January 2010
+Why:	/sys/fs/o2cb is the proper location for this information - /sys/o2cb
+	exists as a symlink for backwards compatibility for old versions of
+	ocfs2-tools. 2 years should be sufficient time to phase in new versions
+	which know to look in /sys/fs/o2cb.
+Who:	ocfs2-devel@oss.oracle.com
+
+---------------------------
+
 What:	Ability for non root users to shm_get hugetlb pages based on mlock
 	resource limits
 When:	2.6.31

trunk/Documentation/filesystems/ext4.txt

@@ -226,6 +226,10 @@ acl			Enables POSIX Access Control Lists support.
 noacl			This option disables POSIX Access Control List
 			support.
 
+reservation
+
+noreservation
+
 bsddf		(*)	Make 'df' act like BSD.
 minixdf			Make 'df' act like Minix.
 

trunk/Documentation/filesystems/ocfs2.txt

@@ -46,15 +46,9 @@ errors=panic		Panic and halt the machine if an error occurs.
 intr		(*)	Allow signals to interrupt cluster operations.
 nointr			Do not allow signals to interrupt cluster
 			operations.
-noatime			Do not update access time.
-relatime(*)		Update atime if the previous atime is older than
-			mtime or ctime
-strictatime		Always update atime, but the minimum update interval
-			is specified by atime_quantum.
 atime_quantum=60(*)	OCFS2 will not update atime unless this number
 			of seconds has passed since the last update.
-			Set to zero to always update atime. This option need
-			work with strictatime.
+			Set to zero to always update atime.
 data=ordered	(*)	All data are forced directly out to the main file
 			system prior to its metadata being committed to the
 			journal.

trunk/Documentation/filesystems/xfs.txt

@@ -39,12 +39,6 @@ When mounting an XFS filesystem, the following options are accepted.
 	drive level write caching to be enabled, for devices that
 	support write barriers.
 
-  discard
-	Issue command to let the block device reclaim space freed by the
-	filesystem.  This is useful for SSD devices, thinly provisioned
-	LUNs and virtual machine images, but may have a performance
-	impact.  This option is incompatible with the nodelaylog option.
-
   dmapi
 	Enable the DMAPI (Data Management API) event callouts.
 	Use with the "mtpt" option.

trunk/MAINTAINERS

@@ -3572,16 +3572,9 @@ M:	Andrew Morton <akpm@linux-foundation.org>
 M:	Jan Kara <jack@suse.cz>
 L:	linux-ext4@vger.kernel.org
 S:	Maintained
-F:	fs/jbd/
-F:	include/linux/ext3_jbd.h
-F:	include/linux/jbd.h
-
-JOURNALLING LAYER FOR BLOCK DEVICES (JBD2)
-M:	"Theodore Ts'o" <tytso@mit.edu>
-L:	linux-ext4@vger.kernel.org
-S:	Maintained
-F:	fs/jbd2/
-F:	include/linux/jbd2.h
+F:	fs/jbd*/
+F:	include/linux/ext*jbd*.h
+F:	include/linux/jbd*.h
 
 JSM Neo PCI based serial card
 M:	Breno Leitao <leitao@linux.vnet.ibm.com>