• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 133bb595
    Linus Torvalds authored
    Pull block updates from Jens Axboe:
     "This is a bit bigger than it should be, but I could (did) not want to
      send it off last week due to both wanting extra testing, and expecting
      a fix for the bounce regression as well.  In any case, this contains:
    
       - Fix for the blk-merge.c compilation warning on gcc 5.x from me.
    
       - A set of back/front SG gap merge fixes, from me and from Sagi.
         This ensures that we honor SG gapping for integrity payloads as
         well.
    
       - Two small fixes for null_blk from Matias, fixing a leak and a
         capacity propagation issue.
    
       - A blkcg fix from Tejun, fixing a NULL dereference.
    
       - A fast clone optimization from Ming, fixing a performance
         regression since the arbitrarily sized bio's were introduced.
    
       - Also from Ming, a regression fix for bouncing IOs"
    
    * 'for-linus' of git://git.kernel.dk/linux-block:
      block: fix bounce_end_io
      block: blk-merge: fast-clone bio when splitting rw bios
      block: blkg_destroy_all() should clear q->root_blkg and ->root_rl.blkg
      block: Copy a user iovec if it includes gaps
      block: Refuse adding appending a gapped integrity page to a bio
      block: Refuse request/bio merges with gaps in the integrity payload
      block: Check for gaps on front and back merges
      null_blk: fix wrong capacity when bs is not 512 bytes
      null_blk: fix memory leak on cleanup
      block: fix bogus compiler warnings in blk-merge.c
    133bb595