• L
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 522a15db
    Linus Torvalds 提交于
    Pull block layer fixes from Jens Axboe:
     "A smaller collection of fixes that have come up since the initial
      merge window pull request.  This contains:
    
       - error handling cleanup and support for larger than 16 byte cdbs in
         sg_io() from Christoph.  The latter just matches what bsg and
         friends support, sg_io() got left out in the merge.
    
       - an option for brd to expose partitions in /proc/partitions.  They
         are hidden by default for compat reasons.  From Dmitry Monakhov.
    
       - a few blk-mq fixes from me - killing a dead/unused flag, fix for
         merging happening even if turned off, and correction of a few
         comments.
    
       - removal of unnecessary ->owner setting in systemace.  From Michal
         Simek.
    
       - two related fixes for a problem with nesting freezing of queues in
         blk-mq.  One from Ming Lei removing an unecessary freeze operation,
         and another from Tejun fixing the nesting regression introduced in
         the merge window.
    
       - fix for a BUG_ON() at bio_endio time when protection info is
         attached and the IO has an error.  From Sagi Grimberg.
    
       - two scsi_ioctl bug fixes for regressions with scsi-mq from Tony
         Battersby.
    
       - a cfq weight update fix and subsequent comment update from Toshiaki
         Makita"
    
    * 'for-linus' of git://git.kernel.dk/linux-block:
      cfq-iosched: Add comments on update timing of weight
      cfq-iosched: Fix wrong children_weight calculation
      block: fix error handling in sg_io
      fix regression in SCSI_IOCTL_SEND_COMMAND
      scsi-mq: fix requests that use a separate CDB buffer
      block: support > 16 byte CDBs for SG_IO
      block: cleanup error handling in sg_io
      brd: add ram disk visibility option
      block: systemace: Remove .owner field for driver
      blk-mq: blk_mq_freeze_queue() should allow nesting
      blk-mq: correct a few wrong/bad comments
      block: Fix BUG_ON when pi errors occur
      blk-mq: don't allow merges if turned off for the queue
      blk-mq: get rid of unused BLK_MQ_F_SHOULD_SORT flag
      blk-mq: fix WARNING "percpu_ref_kill() called more than once!"
    522a15db
scsi_lib.c 76.2 KB