• Linus Torvalds's avatar
    Merge tag 'for-linus-20181102' of git://git.kernel.dk/linux-block · 5f215853
    Linus Torvalds authored
    Pull block layer fixes from Jens Axboe:
     "The biggest part of this pull request is the revert of the blkcg
      cleanup series. It had one fix earlier for a stacked device issue, but
      another one was reported. Rather than play whack-a-mole with this,
      revert the entire series and try again for the next kernel release.
      Apart from that, only small fixes/changes.
       - Indentation fixup for mtip32xx (Colin Ian King)
       - The blkcg cleanup series revert (Dennis Zhou)
       - Two NVMe fixes. One fixing a regression in the nvme request
         initialization in this merge window, causing nvme-fc to not work.
         The other is a suspend/resume p2p resource issue (James, Keith)
       - Fix sg discard merge, allowing us to merge in cases where we didn't
         before (Jianchao Wang)
       - Call rq_qos_exit() after the queue is frozen, preventing a hang
       - Fix brd queue setup, fixing an oops if we fail setting up all
         devices (Ming)"
    * tag 'for-linus-20181102' of git://git.kernel.dk/linux-block:
      nvme-pci: fix conflicting p2p resource adds
      nvme-fc: fix request private initialization
      blkcg: revert blkcg cleanups series
      block: brd: associate with queue until adding disk
      block: call rq_qos_exit() after queue is frozen
      mtip32xx: clean an indentation issue, remove extraneous tabs
      block: fix the DISCARD request merge
blk-iolatency.c 28.3 KB