Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
9c1db77981
linux/Documentation/block
History
Jens Axboe b28bc9b38c Linux 3.13-rc6 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJSwLfoAAoJEHm+PkMAQRiGi6QH/1U1B7lmHChDTw3jj1lfm9gA
 189Si4QJlnxFWCKHvKEL+pcaVuACU+aMGI8+KyMYK4/JfuWVjjj5fr/SvyHH2/8m
 LdSK8aHMhJ46uBS4WJ/l6v46qQa5e2vn8RKSBAyKm/h4vpt+hd6zJdoFrFai4th7
 k/TAwOAEHI5uzexUChwLlUBRTvbq4U8QUvDu+DeifC8cT63CGaaJ4qVzjOZrx1an
 eP6UXZrKDASZs7RU950i7xnFVDQu4PsjlZi25udsbeiKcZJgPqGgXz5ULf8ZH8RQ
 YCi1JOnTJRGGjyIOyLj7pyB01h7XiSM2+eMQ0S7g54F2s7gCJ58c2UwQX45vRWU=
 =/4/R
 -----END PGP SIGNATURE-----

Merge tag 'v3.13-rc6' into for-3.14/core

Needed to bring blk-mq uptodate, since changes have been going in
since for-3.14/core was established.

Fixup merge issues related to the immutable biovec changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
	block/blk-flush.c
	fs/btrfs/check-integrity.c
	fs/btrfs/extent_io.c
	fs/btrfs/scrub.c
	fs/logfs/dev_bdev.c
2013-12-31 09:51:02 -07:00
..
00-INDEX block: change config option name for cmdline partition parsing 2013-09-30 14:31:02 -07:00
biodoc.txt block: Abstract out bvec iterator 2013-11-23 22:33:47 -08:00
biovecs.txt block: Immutable bio vecs 2013-11-23 22:33:49 -08:00
capability.txt genhd: expose AN to user space 2007-05-23 20:14:11 -07:00
cfq-iosched.txt doc: Fix typo in doucmentations 2013-07-25 12:34:15 +02:00
cmdline-partition.txt block: change config option name for cmdline partition parsing 2013-09-30 14:31:02 -07:00
data-integrity.txt Trivial typo fixes in Documentation/block/data-integrity.txt. 2009-07-01 10:56:25 +02:00
deadline-iosched.txt trivial: Miscellaneous documentation typo fixes 2009-06-12 18:01:47 +02:00
ioprio.txt Update Jens Axboe's email in Documentation/* 2007-10-16 09:59:55 +02:00
null_blk.txt null_blk: set use_per_node_hctx param to false 2013-12-21 09:30:33 -07:00
queue-sysfs.txt doc: fix misspellings with 'codespell' tool 2013-05-28 12:02:12 +02:00
request.txt Update Jens Axboe's email in Documentation/* 2007-10-16 09:59:55 +02:00
stat.txt
switching-sched.txt Documentation: drop as block elevator reference in switching-sched.txt 2011-11-04 12:01:48 -07:00
writeback_cache_control.txt block: update documentation for REQ_FLUSH / REQ_FUA 2010-09-10 12:35:37 +02:00