tree 7cc836bee0dbd491aea2b699f0389012ff15501d
parent 79683f80e4f07dba13cc08d0ebcf5c7b0aa1bf68
parent b0f2853b56a2acaff19cca2c6a608f8ec268d21a
author Linus Torvalds <torvalds@linux-foundation.org> 1516301692 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1516301692 -0800

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull two NVMe fixes from Jens Axboe:
 "Two important fixes for the sgl support for nvme that is new in this
  release"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nvme-pci: take sglist coalescing in dma_map_sg into account
  nvme-pci: check segement valid for SGL use