| commit | 4f572efde4600a577d1fc0bcee191bc9cec842f8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 07 17:55:16 2018 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 07 17:55:16 2018 -0700 |
| tree | dcd27d87a620ef89bdf70aa71de33bd36ec93df7 | |
| parent | 89ac2233d34dcf87854ad48d638d1a86db3f6bd2 [diff] | |
| parent | 7ec916f82c48dcfc115eee2e3e0e6d400e310fc5 [diff] |
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()"