From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Nov 2018 17:24:40 +0000 (-0800)
Subject: Merge tag 'dma-mapping-4.20-3' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v4.20-rc4~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d6d460b89378b1bc6715574cdafd748ba59d5a27;p=users%2Fdwmw2%2Flinux.git

Merge tag 'dma-mapping-4.20-3' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "Two dma-direct / swiotlb regressions fixes:

   - zero is a valid physical address on some arm boards, we can't use
     it as the error value

   - don't try to cache flush the error return value (no matter what it
     is)"

* tag 'dma-mapping-4.20-3' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: Skip cache maintenance on map error
  dma-direct: Make DIRECT_MAPPING_ERROR viable for SWIOTLB
---

d6d460b89378b1bc6715574cdafd748ba59d5a27