Merge tag 'dma-mapping-5.3-3' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Aug 2019 15:41:11 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Aug 2019 15:41:11 +0000 (08:41 -0700)
commit35fca9f8a999627e3291907992b299b1207baee5
tree3ecb49c11be53bce0991f222b2a8943938fa4025
parent1e78030e5e5b2d8b0cad7136caf9cfab986a6bff
parentf46cc0152501e46d1b3aa5e7eade61145070eab0
Merge tag 'dma-mapping-5.3-3' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping regression fixes from Christoph Hellwig:
 "Two related regression fixes for changes from this merge window to fix
  alignment issues introduced in the CMA allocation rework (Nicolin
  Chen)"

* tag 'dma-mapping-5.3-3' of git://git.infradead.org/users/hch/dma-mapping:
  dma-contiguous: page-align the size in dma_free_contiguous()
  dma-contiguous: do not overwrite align in dma_alloc_contiguous()