diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-18 10:54:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-18 10:54:52 -0800 |
| commit | cdbe3bf418c1d25a4dca046bafbe846b841699aa (patch) | |
| tree | 7cc836bee0dbd491aea2b699f0389012ff15501d /mm/memory.c | |
| parent | 79683f80e4f07dba13cc08d0ebcf5c7b0aa1bf68 (diff) | |
| parent | b0f2853b56a2acaff19cca2c6a608f8ec268d21a (diff) | |
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
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions