summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2016-07-20 23:48:25 -0400
committerMike Snitzer <snitzer@redhat.com>2016-07-20 23:48:25 -0400
commite9ccb945c4d937189668f9e3cf00949da4727762 (patch)
treeeaab238041449d8ea199819a49422efb4aee828c /Documentation
parent2a0fbffb1e50939a969d5efe495667a3aa0f72f7 (diff)
parent72ef799b3f14f4cb4c56ba3af6e6bdcbae6df368 (diff)
downloadlinux-e9ccb945c4d937189668f9e3cf00949da4727762.tar.bz2
Merge remote-tracking branch 'jens/for-4.8/core' into dm-4.8
DM's DAX support depends on block core's newly added QUEUE_FLAG_DAX.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/block/queue-sysfs.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/block/queue-sysfs.txt b/Documentation/block/queue-sysfs.txt
index dce25d848d92..d515d58962b9 100644
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
@@ -53,7 +53,7 @@ disk.
logical_block_size (RO)
-----------------------
-This is the logcal block size of the device, in bytes.
+This is the logical block size of the device, in bytes.
max_hw_sectors_kb (RO)
----------------------