diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
| commit | 159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch) | |
| tree | dd9b0204d90b25e1e0be933348776f09434333c6 /block | |
| parent | 05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff) | |
| parent | c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual rocket science -- mostly documentation and comment updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
sparse: fix comment
doc: fix double words
isdn: capi: fix "CAPI_VERSION" comment
doc: DocBook: Fix typos in xml and template file
Bluetooth: add module name for btwilink
driver core: unexport static function create_syslog_header
mmc: core: typo fix in printk specifier
ARM: spear: clean up editing mistake
net-sysfs: fix comment typo 'CONFIG_SYFS'
doc: Insert MODULE_ in module-signing macros
Documentation: update URL to hfsplus Technote 1150
gpio: update path to documentation
ixgbe: Fix format string in ixgbe_fcoe.
Kconfig: Remove useless "default N" lines
user_namespace.c: Remove duplicated word in comment
CREDITS: fix formatting
treewide: Fix typo in Documentation/DocBook
mm: Fix warning on make htmldocs caused by slab.c
ata: ata-samsung_cf: cleanup in header file
idr: remove unused prototype of idr_free()
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 2 | ||||
| -rw-r--r-- | block/blk-map.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index e45b321cf6a0..34d7c196338b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
| @@ -1928,7 +1928,7 @@ EXPORT_SYMBOL(submit_bio); | |||
| 1928 | * in some cases below, so export this function. | 1928 | * in some cases below, so export this function. |
| 1929 | * Request stacking drivers like request-based dm may change the queue | 1929 | * Request stacking drivers like request-based dm may change the queue |
| 1930 | * limits while requests are in the queue (e.g. dm's table swapping). | 1930 | * limits while requests are in the queue (e.g. dm's table swapping). |
| 1931 | * Such request stacking drivers should check those requests agaist | 1931 | * Such request stacking drivers should check those requests against |
| 1932 | * the new queue limits again when they dispatch those requests, | 1932 | * the new queue limits again when they dispatch those requests, |
| 1933 | * although such checkings are also done against the old queue limits | 1933 | * although such checkings are also done against the old queue limits |
| 1934 | * when submitting requests. | 1934 | * when submitting requests. |
diff --git a/block/blk-map.c b/block/blk-map.c index ae4ae1047fd9..cca6356d216d 100644 --- a/block/blk-map.c +++ b/block/blk-map.c | |||
| @@ -285,7 +285,7 @@ EXPORT_SYMBOL(blk_rq_unmap_user); | |||
| 285 | * | 285 | * |
| 286 | * Description: | 286 | * Description: |
| 287 | * Data will be mapped directly if possible. Otherwise a bounce | 287 | * Data will be mapped directly if possible. Otherwise a bounce |
| 288 | * buffer is used. Can be called multple times to append multple | 288 | * buffer is used. Can be called multiple times to append multiple |
| 289 | * buffers. | 289 | * buffers. |
| 290 | */ | 290 | */ |
| 291 | int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, | 291 | int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, |