Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus-20180425' of git://git.kernel.dk/linux-block · 8fba70b0
    Linus Torvalds authored
    Pull block updates from Jens Axboe:
     "I ended up sitting on this about a week longer than I wanted to, since
      we were hashing out details with a timeout change. I've now killed
      that patch, so we can flush the existing queue in due time.
    
      This contains:
    
       - Fix for an old regression, where entering the queue can be
         disturbed by a signal to the process. This can cause spurious EIO.
         Fix from Alan Jenkins.
    
       - cdrom information leak fix from Dan.
    
       - Trivial helper for testing queue FUA from Dave Chinner, part of his
         O_DIRECT FUA series.
    
       - Series of swim fixes from Finn that actually makes it work again.
    
       - Loop O_DIRECT corruption fix, which caused data corruption in
         production for us. From me.
    
       - BFQ crash fix from me.
    
       - bcache maintainer update. Michael no longer has the time to do it,
         Coly has stepped up to serve as the new maintainer.
    
       - blkcg locking fixes from Jiang Biao.
    
       - Revert of a change from this merge window from Ming, that causes an
         issue on some hardware.
    
       - Minor clarification doc addition from Linus Walleij"
    
    * tag 'for-linus-20180425' of git://git.kernel.dk/linux-block: (22 commits)
      Revert "blk-mq: remove code for dealing with remapping queue"
      block: mq: Add some minor doc for core structs
      bcache: mark Coly Li as bcache maintainer
      MAINTAINERS: Remove me as maintainer of bcache
      blkcg: init root blkcg_gq under lock
      blkcg: small fix on comment in blkcg_init_queue
      blkcg: don't hold blkcg lock when deactivating policy
      block: add blk_queue_fua() helper function
      cdrom: information leak in cdrom_ioctl_media_changed()
      bfq-iosched: ensure to clear bic/bfqq pointers when preparing request
      blk-mq: start request gstate with gen 1
      block/swim: Select appropriate drive on device open
      block/swim: Fix IO error at end of medium
      block/swim: Check drive type
      block/swim: Rename macros to avoid inconsistent inverted logic
      block/swim: Don't log an error message for an invalid ioctl
      block/swim: Remove extra put_disk() call from error path
      block/swim: Fix array bounds check
      m68k/mac: Don't remap SWIM MMIO region
      loop: handle short DIO reads
      ...
    8fba70b0