git.stricted.de - GitHub/LineageOS/android_kernel_motorola

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

author	Jens Axboe <axboe@kernel.dk>
	Tue, 31 Dec 2013 16:51:02 +0000 (09:51 -0700)
committer	Jens Axboe <axboe@kernel.dk>
	Tue, 31 Dec 2013 16:51:02 +0000 (09:51 -0700)
commit	b28bc9b38c52f63f43e3fd875af982f2240a2859
tree	76cdb7b52b58f5685993cc15ed81d1c903023358	tree \| snapshot (tar.gz zip)
parent	8d30726912cb39c3a3ebde06214d54861f8fdde2	commit \| diff
parent	802eee95bde72fd0cd0f3a5b2098375a487d1eda	commit \| 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

20 files changed:

block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkfront.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/bcache.h	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/btree.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/movinggc.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/super.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/util.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/writeback.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-bufio.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-cache-policy-mq.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-cache-target.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-delay.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-snap.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-thin.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/block/dasd_eckd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkfront.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/bcache.h	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/btree.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/movinggc.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/super.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/util.c	diff1 \|	diff2 \|	blob \| history
drivers/md/bcache/writeback.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-bufio.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-cache-policy-mq.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-cache-target.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-delay.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-snap.c	diff1 \|	diff2 \|	blob \| history
drivers/md/dm-thin.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	diff1 \|	diff2 \|	blob \| history
drivers/s390/block/dasd_eckd.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/zram/zram_drv.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_buf.c	diff1 \|	diff2 \|	blob \| history