Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Sep 2018 03:09:36 +0000 (20:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Sep 2018 03:09:36 +0000 (20:09 -0700)
commit60c1f89241d49bacf71035470684a8d7b4bb46ea
treef545bc7a0ddd189b956e65353f36661f4fc12ae1
parent57361846b52bc686112da6ca5368d11210796804
parent8c89ef7b6b64ba093239305f77a485905d03f7bf
Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "A few fixes for the fallout of being a little more pedantic about dma
  masks"

* tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping:
  of/platform: initialise AMBA default DMA masks
  sparc: set a default 32-bit dma mask for OF devices
  kernel/dma/direct: take DMA offset into account in dma_direct_supported