| commit | b28bc9b38c52f63f43e3fd875af982f2240a2859 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Tue Dec 31 09:51:02 2013 -0700 |
| committer | Jens Axboe <axboe@kernel.dk> | Tue Dec 31 09:51:02 2013 -0700 |
| tree | 76cdb7b52b58f5685993cc15ed81d1c903023358 | |
| parent | 8d30726912cb39c3a3ebde06214d54861f8fdde2 [diff] | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda [diff] |
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