From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Nov 2018 17:53:33 +0000 (-0700)
Subject: Merge tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v4.20-rc1~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3308a383ce99f739a3fa47dbd8564ab517562b51;p=linux-2.6-block.git

Merge tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Avoid compile warnings on non-default arm64 configs"

* tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping:
  arm64: fix warnings without CONFIG_IOMMU_DMA
---

3308a383ce99f739a3fa47dbd8564ab517562b51