Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe: "Final small batch of fixes to be included before -rc1. Some general cleanups in here as well, but some of the blk-mq fixes we need for the NVMe conversion and/or scsi-mq. The pull request contains: - Support for not merging across a specified "chunk size", if set by the driver. Some NVMe devices perform poorly for IO that crosses such a chunk, so we need to support it generically as part of request merging avoid having to do complicated split logic. From me. - Bump max tag depth to 10Ki tags. Some scsi devices have a huge shared tag space. Before we failed with EINVAL if a too large tag depth was specified, now we truncate it and pass back the actual value. From me. - Various blk-mq rq init fixes from me and others. - A fix for enter on a dying queue for blk-mq from Keith. This is needed to prevent oopsing on hot device removal. - Fixup for blk-mq timer addition from Ming Lei. - Small round of performance fixes for mtip32xx from Sam Bradshaw. - Minor stack leak fix from Rickard Strandqvist. - Two __init annotations from Fabian Frederick" * 'for-linus' of git://git.kernel.dk/linux-block: block: add __init to blkcg_policy_register block: add __init to elv_register block: ensure that bio_add_page() always accepts a page for an empty bio blk-mq: add timer in blk_mq_start_request blk-mq: always initialize request->start_time block: blk-exec.c: Cleaning up local variable address returnd mtip32xx: minor performance enhancements blk-mq: ->timeout should be cleared in blk_mq_rq_ctx_init() blk-mq: don't allow queue entering for a dying queue blk-mq: bump max tag depth to 10K tags block: add blk_rq_set_block_pc() block: add notion of a chunk size for request merging
No related branches found
No related tags found
Showing
- block/bio.c 7 additions, 1 deletionblock/bio.c
- block/blk-cgroup.c 1 addition, 1 deletionblock/blk-cgroup.c
- block/blk-cgroup.h 2 additions, 2 deletionsblock/blk-cgroup.h
- block/blk-core.c 18 additions, 0 deletionsblock/blk-core.c
- block/blk-exec.c 5 additions, 0 deletionsblock/blk-exec.c
- block/blk-mq.c 21 additions, 22 deletionsblock/blk-mq.c
- block/blk-settings.c 21 additions, 0 deletionsblock/blk-settings.c
- block/bsg.c 2 additions, 1 deletionblock/bsg.c
- block/elevator.c 1 addition, 1 deletionblock/elevator.c
- block/scsi_ioctl.c 3 additions, 3 deletionsblock/scsi_ioctl.c
- drivers/block/mtip32xx/mtip32xx.c 9 additions, 6 deletionsdrivers/block/mtip32xx/mtip32xx.c
- drivers/block/mtip32xx/mtip32xx.h 4 additions, 4 deletionsdrivers/block/mtip32xx/mtip32xx.h
- drivers/block/pktcdvd.c 1 addition, 1 deletiondrivers/block/pktcdvd.c
- drivers/cdrom/cdrom.c 1 addition, 1 deletiondrivers/cdrom/cdrom.c
- drivers/scsi/device_handler/scsi_dh_alua.c 1 addition, 1 deletiondrivers/scsi/device_handler/scsi_dh_alua.c
- drivers/scsi/device_handler/scsi_dh_emc.c 1 addition, 1 deletiondrivers/scsi/device_handler/scsi_dh_emc.c
- drivers/scsi/device_handler/scsi_dh_hp_sw.c 2 additions, 2 deletionsdrivers/scsi/device_handler/scsi_dh_hp_sw.c
- drivers/scsi/device_handler/scsi_dh_rdac.c 1 addition, 1 deletiondrivers/scsi/device_handler/scsi_dh_rdac.c
- drivers/scsi/osd/osd_initiator.c 2 additions, 2 deletionsdrivers/scsi/osd/osd_initiator.c
- drivers/scsi/osst.c 1 addition, 1 deletiondrivers/scsi/osst.c
Loading
Please register or sign in to comment