Merge tag 'dma-mapping-4.20-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Nov 2018 17:53:33 +0000 (10:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 3 Nov 2018 17:53:33 +0000 (10:53 -0700)
commit3308a383ce99f739a3fa47dbd8564ab517562b51
treedf21570cff267ea0c47125abb7ecf9b7a7676ed3
parent9a12efc5e01ac1dbad089f22e5d0e6f817970c3c
parentf62717551b2b7d72fc2a3975539117d350bad84d
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