• Linus Torvalds's avatar
    Merge branch 'for-3.8/core' of git://git.kernel.dk/linux-block · 60da5bf4
    Linus Torvalds authored
    Pull block layer core updates from Jens Axboe:
     "Here are the core block IO bits for 3.8.  The branch contains:
    
       - The final version of the surprise device removal fixups from Bart.
    
       - Don't hide EFI partitions under advanced partition types.  It's
         fairly wide spread these days.  This is especially dangerous for
         systems that have both msdos and efi partition tables, where you
         want to keep them in sync.
    
       - Cleanup of using -1 instead of the proper NUMA_NO_NODE
    
       - Export control of bdi flusher thread CPU mask and default to using
         the home node (if known) from Jeff.
    
       - Export unplug tracepoint for MD.
    
       - Core improvements from Shaohua.  Reinstate the recursive merge, as
         the original bug has been fixed.  Add plugging for discard and also
         fix a problem handling non pow-of-2 discard limits.
    
      There's a trivial merge in block/blk-exec.c due to a fix that went
      into 3.7-rc at a later point than -rc4 where this is based."
    
    * 'for-3.8/core' of git://git.kernel.dk/linux-block:
      block: export block_unplug tracepoint
      block: add plug for blkdev_issue_discard
      block: discard granularity might not be power of 2
      deadline: Allow 0ms deadline latency, increase the read speed
      partitions: enable EFI/GPT support by default
      bsg: Remove unused function bsg_goose_queue()
      block: Make blk_cleanup_queue() wait until request_fn finished
      block: Avoid scheduling delayed work on a dead queue
      block: Avoid that request_fn is invoked on a dead queue
      block: Let blk_drain_queue() caller obtain the queue lock
      block: Rename queue dead flag
      bdi: add a user-tunable cpu_list for the bdi flusher threads
      block: use NUMA_NO_NODE instead of -1
      block: recursive merge requests
      block CFQ: avoid moving request to different queue
    60da5bf4
scsi_lib.c 66.2 KB