Jens Axboe b28bc9b38c 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

..

partitions

block/partitions/efi.c: fix bound check

2013-11-21 16:42:27 -08:00

blk-cgroup.c

Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block

2013-09-22 15:00:11 -07:00

blk-cgroup.h

Update of blkg_stat and blkg_rwstat may happen in bh context.

2013-11-20 15:33:04 -07:00

blk-core.c

block: Convert bio_for_each_segment() to bvec_iter

2013-11-23 22:33:49 -08:00

blk-exec.c

blk-mq: new multi-queue block IO queueing mechanism

2013-10-25 11:56:00 +01:00

blk-flush.c

block: submit_bio_wait() conversions

2013-11-24 16:33:41 -07:00

blk-integrity.c

bio-integrity: Convert to bvec_iter

2013-11-23 22:33:50 -08:00

blk-ioc.c

block: cleanup removing dependency on bootmem headers

2013-11-08 19:43:48 -07:00

blk-iopoll.c

block: Replace __get_cpu_var uses

2013-11-08 08:59:58 -07:00

blk-lib.c

block: Abstract out bvec iterator

2013-11-23 22:33:47 -08:00

blk-map.c

block: Abstract out bvec iterator

2013-11-23 22:33:47 -08:00

blk-merge.c

block: Really silence spurious compiler warnings

2013-12-03 14:29:09 -07:00

blk-mq-cpu.c

blk-mq: remove newly added instances of __cpuinit

2013-11-14 08:26:02 -07:00

blk-mq-cpumap.c

blk-mq: new multi-queue block IO queueing mechanism

2013-10-25 11:56:00 +01:00

blk-mq-sysfs.c

block: fix memory leaks on unplugging block device

2013-12-06 09:18:02 -07:00

blk-mq-tag.c

blk-mq: new multi-queue block IO queueing mechanism

2013-10-25 11:56:00 +01:00

blk-mq-tag.h

blk-mq: new multi-queue block IO queueing mechanism

2013-10-25 11:56:00 +01:00

blk-mq.c

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

2013-12-31 09:51:02 -07:00

blk-mq.h

blk-mq: new multi-queue block IO queueing mechanism

2013-10-25 11:56:00 +01:00

blk-settings.c

Merge branch 'for-3.13/core' of git://git.kernel.dk/linux-block

2013-11-14 12:08:14 +09:00

blk-softirq.c

kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS

2013-11-15 09:32:22 +09:00

blk-sysfs.c

kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS

2013-11-15 09:32:22 +09:00

blk-tag.c

block: Reserve only one queue tag for sync IO if only 3 tags are available

2013-06-28 21:32:27 +02:00

blk-throttle.c

block: Abstract out bvec iterator

2013-11-23 22:33:47 -08:00

blk-timeout.c

Merge branch 'blk-mq/core' into for-3.13/core

2013-11-08 09:08:12 -07:00

blk.h

blk-mq: new multi-queue block IO queueing mechanism

2013-10-25 11:56:00 +01:00

bsg-lib.c

bsg: Remove unused function bsg_goose_queue()

2012-12-06 14:33:02 +01:00

bsg.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

cfq-iosched.c

block: Use u64_stats_init() to initialize seqcounts

2013-11-13 13:54:08 +01:00

cmdline-parser.c

block: support embedded device command line partition

2013-09-11 15:56:57 -07:00

compat_ioctl.c

kernel-wide: fix missing validations on __get/__put/__copy_to/__copy_from_user()

2013-09-11 15:58:18 -07:00

deadline-iosched.c

block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)

2013-09-11 13:22:03 -06:00

elevator.c

block: Abstract out bvec iterator

2013-11-23 22:33:47 -08:00

genhd.c

block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)

2013-09-11 13:22:03 -06:00

ioctl.c

block: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO

2013-11-08 09:05:31 -07:00

Kconfig

block: change config option name for cmdline partition parsing

2013-09-30 14:31:02 -07:00

Kconfig.iosched

blkcg: make CONFIG_BLK_CGROUP bool

2012-03-06 21:27:21 +01:00

Makefile

blk-mq: new multi-queue block IO queueing mechanism

2013-10-25 11:56:00 +01:00

noop-iosched.c

elevator: Fix a race in elevator switching

2013-07-03 13:25:24 +02:00

partition-generic.c

Revert "loop: cleanup partitions when detaching loop device"

2013-04-08 10:12:11 +02:00

scsi_ioctl.c

block: Use rw_copy_check_uvector()

2013-11-08 09:02:14 -07:00