From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jan 2018 18:54:52 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~9648
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdbe3bf418c1d25a4dca046bafbe846b841699aa;p=platform%2Fkernel%2Flinux-starfive.git

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
---

cdbe3bf418c1d25a4dca046bafbe846b841699aa