From: Linus Torvalds Date: Fri, 16 Feb 2018 20:22:33 +0000 (-0800) Subject: Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping X-Git-Tag: v5.15~9379 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1e3510b2b053b8253a99511efb668fcc7ae8fcd7;p=mirror_ubuntu-kernels.git Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping Pull dma-mapping fixes from Christoph Hellwig: "A few dma-mapping fixes for the fallout from the changes in rc1" * tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping: powerpc/macio: set a proper dma_coherent_mask dma-mapping: fix a comment typo dma-direct: comment the dma_direct_free calling convention dma-direct: mark as is_phys ia64: fix build failure with CONFIG_SWIOTLB --- 1e3510b2b053b8253a99511efb668fcc7ae8fcd7