Merge tag 'dma-mapping-4.20-3' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Nov 2018 17:24:40 +0000 (09:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Nov 2018 17:24:40 +0000 (09:24 -0800)
commitd6d460b89378b1bc6715574cdafd748ba59d5a27
treeb43a2f09bf1fa86264cc01c42f0650832c6619f0
parent17c2f540863a6c0faa3f0ede3c785d9427bcaf80
parentcb216b84d6ea24fa10f1e7aac35de77246841041
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