Jens Axboe 8f66439eec Merge tag 'v4.12-rc5' into for-4.13/block ...

We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

2017-06-12 08:30:13 -06:00

..

aoe

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

drbd

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

mtip32xx

blk-mq: switch ->queue_rq return value to blk_status_t

2017-06-09 09:27:32 -06:00

paride

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

rsxx

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

xen-blkback

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

zram

zram: reduce load operation in page_same_filled

2017-05-03 15:52:11 -07:00

amiflop.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

ataflop.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

brd.c

Merge tag 'libnvdimm-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2017-05-05 18:49:20 -07:00

cciss_cmd.h

cciss: use new doorbell-bit-5 reset method

2011-05-06 08:23:55 -06:00

cciss_scsi.c

cciss: Remove kmalloc cast

2017-02-22 11:54:49 -07:00

cciss_scsi.h

cciss: add cciss_tape_cmds module paramter

2011-05-06 08:23:59 -06:00

cciss.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

cciss.h

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2017-02-21 11:51:42 -08:00

cryptoloop.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

DAC960.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

DAC960.h

…

floppy.c

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

Kconfig

Merge tag 'libnvdimm-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2017-05-05 18:49:20 -07:00

loop.c

Merge tag 'v4.12-rc5' into for-4.13/block

2017-06-12 08:30:13 -06:00

loop.h

loop: support 4k physical blocksize

2017-06-08 08:40:00 -06:00

Makefile

block: remove the osdblk driver

2017-04-19 09:10:51 -06:00

nbd.c

Merge tag 'v4.12-rc5' into for-4.13/block

2017-06-12 08:30:13 -06:00

null_blk.c

blk-mq: switch ->queue_rq return value to blk_status_t

2017-06-09 09:27:32 -06:00

pktcdvd.c

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

ps3disk.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

ps3vram.c

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

rbd_types.h

rbd: RBD_V{1,2}_DATA_FORMAT macros

2017-02-20 12:16:15 +01:00

rbd.c

Merge tag 'v4.12-rc5' into for-4.13/block

2017-06-12 08:30:13 -06:00

skd_main.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

skd_s1120.h

skd: fix formatting in skd_s1120.h

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

smart1,2.h

fix typos 'comamnd' -> 'command' in comments

2011-02-02 11:31:21 +01:00

sunvdc.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

swim3.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

swim_asm.S

m68k: mac - Add SWIM floppy support

2009-03-26 21:15:27 +01:00

swim.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

sx8.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

umem.c

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

umem.h

…

virtio_blk.c

blk-mq: switch ->queue_rq return value to blk_status_t

2017-06-09 09:27:32 -06:00

xen-blkfront.c

block: switch bios to blk_status_t

2017-06-09 09:27:32 -06:00

xsysace.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00

z2ram.c

block: introduce new block status code type

2017-06-09 09:27:32 -06:00