Merge tag 'dma-mapping-4.17-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Apr 2018 18:00:48 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Apr 2018 18:00:48 +0000 (11:00 -0700)
commitc5c177c5fd952720d6b659f596d6eb9be59c9000
treea26d9064a7fbba1780467a8d97e882de263c0636
parentd1cb7718cfe3a464189cb3d1ee2c092565bc8b39
parent9e7f06c8beee304ee21b791653fefcd713f48b9a
Merge tag 'dma-mapping-4.17-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix for one swiotlb regression in 2.16 from Takashi"

* tag 'dma-mapping-4.17-2' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: fix unexpected swiotlb_alloc_coherent failures