From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Oct 2019 18:10:15 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.4-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7cdb85df6061d001fffd09c6adfbcf20356615e2;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'dma-mapping-5.4-1' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping regression fix from Christoph Hellwig:
 "Revert an incorret hunk from a patch that caused problems on various
  arm boards (Andrey Smirnov)"

* tag 'dma-mapping-5.4-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: fix false positive warnings in dma_common_free_remap()
---

7cdb85df6061d001fffd09c6adfbcf20356615e2