Skip to content
  • Linus Torvalds's avatar
    Merge tag 'for-linus-20190112' of git://git.kernel.dk/linux-block · b8c3b899
    Linus Torvalds authored
    Pull block fixes from Jens Axboe:
    
     - NVMe pull request from Christoph, with little fixes all over the map
    
     - Loop caching fix for offset/bs change (Jaegeuk Kim)
    
     - Block documentation tweaks (Jeff, Jon, Weiping, John)
    
     - null_blk zoned tweak (John)
    
     - ahch mvebu suspend/resume support. Should have gone into the merge
       window, but there was some confusion on which tree had it. (Miquel)
    
    * tag 'for-linus-20190112' of git://git.kernel.dk/linux-block: (22 commits)
      ata: ahci: mvebu: request PHY suspend/resume for Armada 3700
      ata: ahci: mvebu: add Armada 3700 initialization needed for S2RAM
      ata: ahci: mvebu: do Armada 38x configuration only on relevant SoCs
      ata: ahci: mvebu: remove stale comment
      ata: libahci_platform: comply to PHY framework
      loop: drop caches if offset or block_size are changed
      block: fix kerneldoc comment for blk_attempt_plug_merge()
      nvme: don't initlialize ctrl->cntlid twice
      nvme: introduce NVME_QUIRK_IGNORE_DEV_SUBNQN
      nvme: pad fake subsys NQN vid and ssvid with zeros
      nvme-multipath: zero out ANA log buffer
      nvme-fabrics: unset write/poll queues for discovery controllers
      nvme-tcp: don't ask if controller is fabrics
      nvme-tcp: remove dead code
      nvme-pci: fix out of bounds access in nvme_cqe_pending
      nvme-pci: rerun irq setup on IO queue init errors
      nvme-pci: use the same attributes when freeing host_mem_desc_bufs.
      nvme-pci: fix the wrong setting of nr_maps
      block: doc: add slice_idle_us to bfq documentation
      block: clarify documentation for blk_{start|finish}_plug
      ...
    b8c3b899