Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 4ce01c51
    Linus Torvalds authored
    Pull block layer fixes from Jens Axboe:
     "A round of fixes/updates for the current series.
    
      This looks a little bigger than it is, but that's mainly because we
      pushed the lightnvm enabled null_blk change out of the merge window so
      it could be updated a bit.  The rest of the volume is also mostly
      lightnvm.  In particular:
    
       - Lightnvm.  Various fixes, additions, updates from Matias and
         Javier, as well as from Wenwei Tao.
    
       - NVMe:
            - Fix for potential arithmetic overflow from Keith.
            - Also from Keith, ensure that we reap pending completions from
              a completion queue before deleting it.  Fixes kernel crashes
              when resetting a device with IO pending.
            - Various little lightnvm related tweaks from Matias.
    
       - Fixup flushes to go through the IO scheduler, for the cases where a
         flush is not required.  Fixes a case in CFQ where we would be
         idling and not see this request, hence not break the idling.  From
         Jan Kara.
    
       - Use list_{first,prev,next} in elevator.c for cleaner code.  From
         Gelian Tang.
    
       - Fix for a warning trigger on btrfs and raid on single queue blk-mq
         devices, where we would flush plug callbacks with preemption
         disabled.  From me.
    
       - A mac partition validation fix from Kees Cook.
    
       - Two merge fixes from Ming, marked stable.  A third part is adding a
         new warning so we'll notice this quicker in the future, if we screw
         up the accounting.
    
       - Cleanup of thread name/creation in mtip32xx from Rasmus Villemoes"
    
    * 'for-linus' of git://git.kernel.dk/linux-block: (32 commits)
      blk-merge: warn if figured out segment number is bigger than nr_phys_segments
      blk-merge: fix blk_bio_segment_split
      block: fix segment split
      blk-mq: fix calling unplug callbacks with preempt disabled
      mac: validate mac_partition is within sector
      mtip32xx: use formatting capability of kthread_create_on_node
      NVMe: reap completion entries when deleting queue
      lightnvm: add free and bad lun info to show luns
      lightnvm: keep track of block counts
      nvme: lightnvm: use admin queues for admin cmds
      lightnvm: missing free on init error
      lightnvm: wrong return value and redundant free
      null_blk: do not del gendisk with lightnvm
      null_blk: use device addressing mode
      null_blk: use ppa_cache pool
      NVMe: Fix possible arithmetic overflow for max segments
      blk-flush: Queue through IO scheduler when flush not required
      null_blk: register as a LightNVM device
      elevator: use list_{first,prev,next}_entry
      lightnvm: cleanup queue before target removal
      ...
    4ce01c51