Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Don't make debugfs depend on DEBUG_KERNEL
  [PATCH] Fix blktrace compile with sysfs not defined
  [PATCH] unused label in drivers/block/cciss.
  [BLOCK] increase size of disk stat counters
  [PATCH] blk_execute_rq_nowait-speedup
  [PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure
  [BLOCK] ll_rw_blk: kmalloc -> kzalloc conversion
  [PATCH] kzalloc() conversion in drivers/block
  [PATCH] update max_sectors documentation

1 files changed, 12 insertions, 2 deletions

diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 8e63831971d..f989a9e839b 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -132,8 +132,18 @@ Some new queue property settings:
                 limit. No highmem default.
 
         blk_queue_max_sectors(q, max_sectors)
-                Maximum size request you can handle in units of 512 byte
-                sectors. 255 default.
+                Sets two variables that limit the size of the request.
+
+                - The request queue's max_sectors, which is a soft size in
+                in units of 512 byte sectors, and could be dynamically varied
+                by the core kernel.
+
+                - The request queue's max_hw_sectors, which is a hard limit
+                and reflects the maximum size request a driver can handle
+                in units of 512 byte sectors.
+
+                The default for both max_sectors and max_hw_sectors is
+                255. The upper limit of max_sectors is 1024.
 
         blk_queue_max_phys_segments(q, max_segments)
                 Maximum physical segments you can handle in a request. 128