From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Apr 2018 18:00:48 +0000 (-0700)
Subject: Merge tag 'dma-mapping-4.17-2' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v4.17-rc1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5c177c5fd952720d6b659f596d6eb9be59c9000;p=thirdparty%2Flinux.git

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

c5c177c5fd952720d6b659f596d6eb9be59c9000