• Linus Torvalds's avatar
    Merge branch 'for-3.19/drivers' of git://git.kernel.dk/linux-block · 9ea18f8c
    Linus Torvalds authored
    Pull block layer driver updates from Jens Axboe:
    
     - NVMe updates:
            - The blk-mq conversion from Matias (and others)
    
            - A stack of NVMe bug fixes from the nvme tree, mostly from Keith.
    
            - Various bug fixes from me, fixing issues in both the blk-mq
              conversion and generic bugs.
    
            - Abort and CPU online fix from Sam.
    
            - Hot add/remove fix from Indraneel.
    
     - A couple of drbd fixes from the drbd team (Andreas, Lars, Philipp)
    
     - With the generic IO stat accounting from 3.19/core, converting md,
       bcache, and rsxx to use those.  From Gu Zheng.
    
     - Boundary check for queue/irq mode for null_blk from Matias.  Fixes
       cases where invalid values could be given, causing the device to hang.
    
     - The xen blkfront pull request, with two bug fixes from Vitaly.
    
    * 'for-3.19/drivers' of git://git.kernel.dk/linux-block: (56 commits)
      NVMe: fix race condition in nvme_submit_sync_cmd()
      NVMe: fix retry/error logic in nvme_queue_rq()
      NVMe: Fix FS mount issue (hot-remove followed by hot-add)
      NVMe: fix error return checking from blk_mq_alloc_request()
      NVMe: fix freeing of wrong request in abort path
      xen/blkfront: remove redundant flush_op
      xen/blkfront: improve protection against issuing unsupported REQ_FUA
      NVMe: Fix command setup on IO retry
      null_blk: boundary check queue_mode and irqmode
      block/rsxx: use generic io stats accounting functions to simplify io stat accounting
      md: use generic io stats accounting functions to simplify io stat accounting
      drbd: use generic io stats accounting functions to simplify io stat accounting
      md/bcache: use generic io stats accounting functions to simplify io stat accounting
      NVMe: Update module version major number
      NVMe: fail pci initialization if the device doesn't have any BARs
      NVMe: add ->exit_hctx() hook
      NVMe: make setup work for devices that don't do INTx
      NVMe: enable IO stats by default
      NVMe: nvme_submit_async_admin_req() must use atomic rq allocation
      NVMe: replace blk_put_request() with blk_mq_free_request()
      ...
    9ea18f8c
nvme-scsi.c 82.9 KB