Merge tag 'dma-mapping-4.17-4' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 May 2018 16:27:39 +0000 (06:27 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 May 2018 16:27:39 +0000 (06:27 -1000)
commitc15f6d8d47152762a2819173599ce0eb135297f1
tree24f850845f35437aefca956fa9113a15f119f312
parentf4ef6a438cee86ca0c6d1b889aa53bec9c1f9de6
parent892a0be43edd63e1cd228af3453a064e9e94f08e
Merge tag 'dma-mapping-4.17-4' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix an incorrect warning selection introduced in the last merge
  window"

* tag 'dma-mapping-4.17-4' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: fix inversed DMA_ATTR_NO_WARN test