Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit b28bc9b3 authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens 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
parents 8d307269 802eee95
No related merge requests found
Showing
with 209 additions and 55 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment