]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1794061 f480738)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jan 2018 18:54:52 +0000 (10:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jan 2018 18:54:52 +0000 (10:54 -0800)
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


Trivial merge
Linux Kernel Source Tree.