From: Linus Torvalds Date: Sun, 1 Jul 2018 17:45:13 +0000 (-0700) Subject: Merge tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c350d6d1d78789d73e8bf2047ab6564a4af4a02b;p=linux.git Merge tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping Pull dma mapping fixlet from Christoph Hellwig: "Add a missing export required by riscv and unicore" * tag 'dma-mapping-4.18-2' of git://git.infradead.org/users/hch/dma-mapping: swiotlb: export swiotlb_dma_ops --- c350d6d1d78789d73e8bf2047ab6564a4af4a02b