• Linus Torvalds's avatar
    Merge tag 'for-linus-20180204' of git://git.kernel.dk/linux-block · 64b28683
    Linus Torvalds authored
    Pull more block updates from Jens Axboe:
     "Most of this is fixes and not new code/features:
       - skd fix from Arnd, fixing a build error dependent on sla allocator
       - blk-mq scheduler discard merging fixes, one from me and one from
         Keith. This fixes a segment miscalculation for blk-mq-sched, where
         we mistakenly think two segments are physically contigious even
         though the request isn't carrying real data. Also fixes a bio-to-rq
         merge case.
       - Don't re-set a bit on the buffer_head flags, if it's already set.
         This can cause scalability concerns on bigger machines and
         workloads. From Kemi Wang.
       - Add BLK_STS_DEV_RESOURCE return value to blk-mq, allowing us to
         distuingish between a local (device related) resource starvation
         and a global one. The latter might happen without IO being in
         flight, so it has to be handled a bit differently. From Ming"
    * tag 'for-linus-20180204' of git://git.kernel.dk/linux-block:
      block: skd: fix incorrect linux/slab_def.h inclusion
      buffer: Avoid setting buffer bits that are already set
      blk-mq-sched: Enable merging discard bio into request
      blk-mq: fix discard merge with scheduler attached
      blk-mq: introduce BLK_STS_DEV_RESOURCE