From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Aug 2019 15:41:11 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.3-3' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=35fca9f8a999627e3291907992b299b1207baee5;p=openwrt%2Fstaging%2Fblogic.git

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

35fca9f8a999627e3291907992b299b1207baee5