• Linus Torvalds's avatar
    Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block · b33ce442
    Linus Torvalds authored
    Pull block driver update from Jens Axboe:
     "On top of the core pull request, here's the pull request for the
      driver related changes for 3.15.  It contains:
    
       - Improvements for msi-x registration for block drivers (mtip32xx,
         skd, cciss, nvme) from Alexander Gordeev.
    
       - A round of cleanups and improvements for drbd from Andreas
         Gruenbacher and Rashika Kheria.
    
       - A round of clanups and improvements for bcache from Kent.
    
       - Removal of sleep_on() and friends in DAC960, ataflop, swim3 from
         Arnd Bergmann.
    
       - Bug fix for a bug in the mtip32xx async completion code from Sam
         Bradshaw.
    
       - Bug fix for accidentally bouncing IO on 32-bit platforms with
         mtip32xx from Felipe Franciosi"
    
    * 'for-3.15/drivers' of git://git.kernel.dk/linux-block: (103 commits)
      bcache: remove nested function usage
      bcache: Kill bucket->gc_gen
      bcache: Kill unused freelist
      bcache: Rework btree cache reserve handling
      bcache: Kill btree_io_wq
      bcache: btree locking rework
      bcache: Fix a race when freeing btree nodes
      bcache: Add a real GC_MARK_RECLAIMABLE
      bcache: Add bch_keylist_init_single()
      bcache: Improve priority_stats
      bcache: Better alloc tracepoints
      bcache: Kill dead cgroup code
      bcache: stop moving_gc marking buckets that can't be moved.
      bcache: Fix moving_pred()
      bcache: Fix moving_gc deadlocking with a foreground write
      bcache: Fix discard granularity
      bcache: Fix another bug recovering from unclean shutdown
      bcache: Fix a bug recovering from unclean shutdown
      bcache: Fix a journalling reclaim after recovery bug
      bcache: Fix a null ptr deref in journal replay
      ...
    b33ce442
nvme-core.c 64.5 KB