diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /Documentation/block/data-integrity.txt | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation/block/data-integrity.txt')
| -rw-r--r-- | Documentation/block/data-integrity.txt | 4 |
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. | |||
| 246 | retrieve the tag buffer using bio_integrity_get_tag(). | 246 | retrieve the tag buffer using bio_integrity_get_tag(). |
| 247 | 247 | ||
| 248 | 248 | ||
| 249 | 6.3 PASSING EXISTING INTEGRITY METADATA | 249 | 5.3 PASSING EXISTING INTEGRITY METADATA |
| 250 | 250 | ||
| 251 | Filesystems that either generate their own integrity metadata or | 251 | Filesystems that either generate their own integrity metadata or |
| 252 | are capable of transferring IMD from user space can use the | 252 | are capable of transferring IMD from user space can use the |
| @@ -283,7 +283,7 @@ will require extra work due to the application tag. | |||
| 283 | integrity upon completion. | 283 | integrity upon completion. |
| 284 | 284 | ||
| 285 | 285 | ||
| 286 | 6.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY | 286 | 5.4 REGISTERING A BLOCK DEVICE AS CAPABLE OF EXCHANGING INTEGRITY |
| 287 | METADATA | 287 | METADATA |
| 288 | 288 | ||
| 289 | To enable integrity exchange on a block device the gendisk must be | 289 | To enable integrity exchange on a block device the gendisk must be |