• J
    Merge tag 'v3.13-rc6' into for-3.14/core · b28bc9b3
    Jens Axboe 提交于
    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: NJens 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
    b28bc9b3
btree.c 58.0 KB