2 files changed, 22 insertions, 3 deletions

diff --git a/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss b/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss
index 4f29e5f1ebf..f5bb0a3bb8c 100644
--- a/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss
+++ b/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss
@@ -59,3 +59,15 @@ Kernel Version: 2.6.31
 Contact:        iss_storagedev@hp.com
 Description:    Displays the usage count (number of opens) of logical drive Y
                 of controller X.
+
+Where:          /sys/bus/pci/devices/<dev>/ccissX/resettable
+Date:           February 2011
+Kernel Version: 2.6.38
+Contact:        iss_storagedev@hp.com
+Description:    Value of 1 indicates the controller can honor the reset_devices
+                kernel parameter.  Value of 0 indicates reset_devices cannot be
+                honored.  This is to allow, for example, kexec tools to be able
+                to warn the user if they designate an unresettable device as
+                a dump device, as kdump requires resetting the device in order
+                to work reliably.
+
diff --git a/Documentation/ABI/testing/sysfs-fs-ext4 b/Documentation/ABI/testing/sysfs-fs-ext4
index 5fb709997d9..f22ac0872ae 100644
--- a/Documentation/ABI/testing/sysfs-fs-ext4
+++ b/Documentation/ABI/testing/sysfs-fs-ext4
@@ -48,7 +48,7 @@ Description:
                  will have its blocks allocated out of its own unique
                  preallocation pool.
 
-What:           /sys/fs/ext4/<disk>/inode_readahead
+What:           /sys/fs/ext4/<disk>/inode_readahead_blks
 Date:           March 2008
 Contact:        "Theodore Ts'o" <tytso@mit.edu>
 Description:
@@ -85,7 +85,14 @@ Date:		June 2008
 Contact:        "Theodore Ts'o" <tytso@mit.edu>
 Description:
                 Tuning parameter which (if non-zero) controls the goal
-                inode used by the inode allocator in p0reference to
-                all other allocation hueristics.  This is intended for
+                inode used by the inode allocator in preference to
+                all other allocation heuristics.  This is intended for
                 debugging use only, and should be 0 on production
                 systems.
+
+What:           /sys/fs/ext4/<disk>/max_writeback_mb_bump
+Date:           September 2009
+Contact:        "Theodore Ts'o" <tytso@mit.edu>
+Description:
+                The maximum number of megabytes the writeback code will
+                try to write out before move on to another inode.