From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Sep 2018 03:09:36 +0000 (-0700)
Subject: Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=60c1f89241d49bacf71035470684a8d7b4bb46ea;p=linux.git

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
---

60c1f89241d49bacf71035470684a8d7b4bb46ea