Merge tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2018 00:55:16 +0000 (17:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2018 00:55:16 +0000 (17:55 -0700)
commit4f572efde4600a577d1fc0bcee191bc9cec842f8
treedcd27d87a620ef89bdf70aa71de33bd36ec93df7
parent89ac2233d34dcf87854ad48d638d1a86db3f6bd2
parent7ec916f82c48dcfc115eee2e3e0e6d400e310fc5
Merge tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Revert an incorrect dma-mapping commit for 4.18-rc"

* tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping:
  Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()"