• Linus Torvalds's avatar
    Merge branch 'for-4.2/drivers' of git://git.kernel.dk/linux-block · 6a398a3e
    Linus Torvalds authored
    Pull block driver updates from Jens Axboe:
     "This contains:
    
       - a few race fixes for null_blk, from Akinobu Mita.
    
       - a series of fixes for mtip32xx, from Asai Thambi and Selvan Mani at
         Micron.
    
       - NVMe:
            * Fix for missing error return on allocation failure, from Axel
              Lin.
    
            * Code consolidation and cleanups from Christoph.
    
            * Memory barrier addition, syncing queue count and queue
              pointers. From Jon Derrick.
    
            * Various fixes from Keith, an addition to support user
              issue reset from sysfs or ioctl, and automatic namespace
              rescan.
    
            * Fix from Matias, avoiding losing some request flags when
              marking the request failfast.
    
       - small cleanups and sparse fixups for ps3vram.  From Geert
         Uytterhoeven and Geoff Lavand.
    
       - s390/dasd dead code removal, from Jarod Wilson.
    
       - a set of fixes and optimizations for loop, from Ming Lei.
    
       - conversion to blkdev_reread_part() of loop, dasd, ndb.  From Ming
         Lei.
    
       - updates to cciss.  From Tomas Henzl"
    
    * 'for-4.2/drivers' of git://git.kernel.dk/linux-block: (44 commits)
      mtip32xx: Fix accessing freed memory
      block: nvme-scsi: Catch kcalloc failure
      NVMe: Fix IO for extended metadata formats
      nvme: don't overwrite req->cmd_flags on sync cmd
      mtip32xx: increase wait time for hba reset
      mtip32xx: fix minor number
      mtip32xx: remove unnecessary sleep in mtip_ftl_rebuild_poll()
      mtip32xx: fix crash on surprise removal of the drive
      mtip32xx: Abort I/O during secure erase operation
      mtip32xx: fix incorrectly setting MTIP_DDF_SEC_LOCK_BIT
      mtip32xx: remove unused variable 'port->allocated'
      mtip32xx: fix rmmod issue
      MAINTAINERS: Update ps3vram block driver
      block/ps3vram: Remove obsolete reference to MTD
      block/ps3vram: Fix sparse warnings
      NVMe: Automatic namespace rescan
      NVMe: Memory barrier before queue_count is incremented
      NVMe: add sysfs and ioctl controller reset
      null_blk: restart request processing on completion handler
      null_blk: prevent timer handler running on a different CPU where started
      ...
    6a398a3e
nvme-scsi.c 67.8 KB