Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 06ede5f6
    Linus Torvalds authored
    Pull more block layer updates from Jens Axboe:
     "A followup pull request, with some parts that either needed a bit more
      testing before going in, merge sync, or just later arriving fixes.
      This contains:
    
       - Timer related updates from Kees. These were purposefully delayed
         since I didn't want to pull in a later v4.14-rc tag to my block
         tree.
    
       - ide-cd prep sense buffer fix from Bart. Also delayed, as not to
         clash with the late fix we put into 4.14-rc.
    
       - Small BFQ updates series from Luca and Paolo.
    
       - Single nvmet fix from James, fixing a non-functional case there.
    
       - Bio fast clone fix from Michael, which made bcache return the wrong
         data for some cases.
    
       - Legacy IO path regression hang fix from Ming"
    
    * 'for-linus' of git://git.kernel.dk/linux-block:
      bio: ensure __bio_clone_fast copies bi_partno
      nvmet_fc: fix better length checking
      block: wake up all tasks blocked in get_request()
      block, bfq: move debug blkio stats behind CONFIG_DEBUG_BLK_CGROUP
      block, bfq: update blkio stats outside the scheduler lock
      block, bfq: add missing invocations of bfqg_stats_update_io_add/remove
      doc, block, bfq: update max IOPS sustainable with BFQ
      ide: Make ide_cdrom_prep_fs() initialize the sense buffer pointer
      md: Convert timers to use timer_setup()
      block: swim3: Convert timers to use timer_setup()
      block/aoe: Convert timers to use timer_setup()
      amifloppy: Convert timers to use timer_setup()
      block/floppy: Convert callback to pass timer_list
    06ede5f6