From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 May 2018 16:27:39 +0000 (-1000)
Subject: Merge tag 'dma-mapping-4.17-4' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c15f6d8d47152762a2819173599ce0eb135297f1;p=openwrt%2Fstaging%2Fblogic.git

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

c15f6d8d47152762a2819173599ce0eb135297f1