projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 883c9ab 210d079)
Merge tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Jul 2018 17:45:13 +0000 (10:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Jul 2018 17:45:13 +0000 (10:45 -0700)
Pull dma mapping fixlet from Christoph Hellwig:
 "Add a missing export required by riscv and unicore"

* tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: export swiotlb_dma_ops


Trivial merge
Linux 6.x block layer and io_uring tree(s)