• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · f412f2c6
    Linus Torvalds authored
    Pull second round of block driver updates from Jens Axboe:
     "As mentioned in the original pull request, the bcache bits were pulled
      because of their dependency on the immutable bio vecs.  Kent re-did
      this part and resubmitted it, so here's the 2nd round of (mostly)
      driver updates for 3.13.  It contains:
    
     - The bcache work from Kent.
    
     - Conversion of virtio-blk to blk-mq.  This removes the bio and request
       path, and substitutes with the blk-mq path instead.  The end result
       almost 200 deleted lines.  Patch is acked by Asias and Christoph, who
       both did a bunch of testing.
    
     - A removal of bootmem.h include from Grygorii Strashko, part of a
       larger series of his killing the dependency on that header file.
    
     - Removal of __cpuinit from blk-mq from Paul Gortmaker"
    
    * 'for-linus' of git://git.kernel.dk/linux-block: (56 commits)
      virtio_blk: blk-mq support
      blk-mq: remove newly added instances of __cpuinit
      bcache: defensively handle format strings
      bcache: Bypass torture test
      bcache: Delete some slower inline asm
      bcache: Use ida for bcache block dev minor
      bcache: Fix sysfs splat on shutdown with flash only devs
      bcache: Better full stripe scanning
      bcache: Have btree_split() insert into parent directly
      bcache: Move spinlock into struct time_stats
      bcache: Kill sequential_merge option
      bcache: Kill bch_next_recurse_key()
      bcache: Avoid deadlocking in garbage collection
      bcache: Incremental gc
      bcache: Add make_btree_freeing_key()
      bcache: Add btree_node_write_sync()
      bcache: PRECEDING_KEY()
      bcache: bch_(btree|extent)_ptr_invalid()
      bcache: Don't bother with bucket refcount for btree node allocations
      bcache: Debug code improvements
      ...
    f412f2c6
virtio_blk.c 20.1 KB