From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jul 2018 00:55:16 +0000 (-0700)
Subject: Merge tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v4.19~652
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f572efde4600a577d1fc0bcee191bc9cec842f8;p=platform%2Fkernel%2Flinux-rpi3.git

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()"
---

4f572efde4600a577d1fc0bcee191bc9cec842f8