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

..

aoe

aoe: Convert to immutable biovecs

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

drbd

block: Immutable bio vecs

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

mtip32xx

block: Convert bio_for_each_segment() to bvec_iter

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

paride

block_device_operations->release() should return void

2013-05-07 02:16:21 -04:00

rsxx

block: Convert bio_for_each_segment() to bvec_iter

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

xen-blkback

block: Abstract out bvec iterator

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

amiflop.c

tree-wide: use reinit_completion instead of INIT_COMPLETION

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

ataflop.c

block_device_operations->release() should return void

2013-05-07 02:16:21 -04:00

brd.c

block: Convert bio_for_each_segment() to bvec_iter

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

cciss_cmd.h

…

cciss_scsi.c

cciss: switch to ->show_info()

2013-04-09 14:13:19 -04:00

cciss_scsi.h

…

cciss.c

tree-wide: use reinit_completion instead of INIT_COMPLETION

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

cciss.h

…

cpqarray.c

cpqarray: fix info leak in ida_locked_ioctl()

2013-09-24 17:00:26 -07:00

cpqarray.h

…

cryptoloop.c

move linux/loop.h to drivers/block

2013-06-29 12:46:45 +04:00

DAC960.c

procfs: new helper - PDE_DATA(inode)

2013-04-09 14:13:32 -04:00

DAC960.h

…

floppy.c

block: Convert bio_for_each_segment() to bvec_iter

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

hd.c

…

ida_cmd.h

…

ida_ioctl.h

…

Kconfig

Merge branch 'for-3.13/post-mq-drivers' into for-linus

2013-11-14 08:29:01 -07:00

loop.c

block: Convert bio_for_each_segment() to bvec_iter

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

loop.h

move linux/loop.h to drivers/block

2013-06-29 12:46:45 +04:00

Makefile

Merge branch 'for-3.13/post-mq-drivers' into for-linus

2013-11-14 08:29:01 -07:00

mg_disk.c

mg_disk: remove deprecated IRQF_DISABLED

2013-11-08 09:10:27 -07:00

nbd.c

block: Immutable bio vecs

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

null_blk.c

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

2013-12-24 10:06:03 -08:00

nvme-core.c

block: Introduce new bio_split()

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

nvme-scsi.c

NVMe: Use kzalloc instead of kmalloc+memset

2013-06-19 13:24:27 -04:00

osdblk.c

block: replace strict_strtoul() with kstrtoul()

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

pktcdvd.c

block: Introduce new bio_split()

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

ps3disk.c

block: Kill bio_segments()/bi_vcnt usage

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

ps3vram.c

block: Convert bio_for_each_segment() to bvec_iter

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

rbd_types.h

…

rbd.c

rbd: Refactor bio cloning

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

skd_main.c

drivers: block: Mark the functions as static in skd_main.c

2013-12-19 08:06:49 -07:00

skd_s1120.h

skd: fix formatting in skd_s1120.h

2013-11-08 09:10:30 -07:00

smart1,2.h

…

sunvdc.c

…

swim3.c

block_device_operations->release() should return void

2013-05-07 02:16:21 -04:00

swim_asm.S

…

swim.c

drivers/block/swim.c: remove unnecessary platform_set_drvdata()

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

sx8.c

…

umem.c

block: Convert drivers to immutable biovecs

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

umem.h

…

virtio_blk.c

virtio-blk: virtqueue_kick() must be ordered with other virtqueue operations

2013-11-19 19:00:45 -07:00

xen-blkfront.c

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

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

xsysace.c

xilinx systemace: Fix sparse warnings

2013-07-10 07:47:12 +02:00

z2ram.c

block_device_operations->release() should return void

2013-05-07 02:16:21 -04:00