projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f4ef6a4 892a0be)
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)
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


Trivial merge
John Crispins staging tree