From: Linus Torvalds Date: Thu, 21 Sep 2017 15:51:03 +0000 (-1000) Subject: Merge tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=20c29a97559c9a59991170d3d648884a9f6aacd3;p=linux.git Merge tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping Pull dma mapping fix from Christoph Hellwig: "A fix for a fix that went in this merge window from Arnd" * tag 'dma-mapping-4.14-2' of git://git.infradead.org/users/hch/dma-mapping: dma-coherent: fix rmem_dma_device_init regression --- 20c29a97559c9a59991170d3d648884a9f6aacd3