summaryrefslogtreecommitdiff
path: root/Documentation/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 23:18:16 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 23:18:16 +0400
commitd1b5726358ccebcf614fc9f97cdf3354178dcb80 (patch)
treed7bbd8e24bd312d9c2c18fc18f12f6a8ce9b084f /Documentation/block
parentc472273f863c80b87e53356256c5466df24328f0 (diff)
parent656e6c0050fd63ce42c55a6cb454a9b4b2f9ccf7 (diff)
downloadlinux-d1b5726358ccebcf614fc9f97cdf3354178dcb80.tar.xz
Merge branch 'docs' of git://git.lwn.net/linux-2.6
* 'docs' of git://git.lwn.net/linux-2.6: Document panic_on_unrecovered_nmi sysctl Add a reference to paper to SubmittingPatches Add kerneldoc documentation for new printk format extensions Remove videobook.tmpl doc: Test-by? Add the development process document Documentation/block/data-integrity.txt: Fix section numbers
Diffstat (limited to 'Documentation/block')
-rw-r--r--Documentation/block/data-integrity.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/block/data-integrity.txt b/Documentation/block/data-integrity.txt
index e9dc8d86adc7..e8ca040ba2cf 100644
--- a/Documentation/block/data-integrity.txt
+++ b/Documentation/block/data-integrity.txt
@@ -246,7 +246,7 @@ will require extra work due to the application tag.
retrieve the tag buffer using bio_integrity_get_tag().
-6.3 PASSING EXISTING INTEGRITY METADATA
+5.3 PASSING EXISTING INTEGRITY METADATA
Filesystems that either generate their own integrity metadata or
are capable of transferring IMD from user space can use the
@@ -283,7 +283,7 @@ will require extra work due to the application tag.
integrity upon completion.
-6.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY
+5.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY
METADATA
To enable integrity exchange on a block device the gendisk must be