projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af27d94 7bcfab2)
Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Feb 2018 20:22:33 +0000 (12:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Feb 2018 20:22:33 +0000 (12:22 -0800)
commit1e3510b2b053b8253a99511efb668fcc7ae8fcd7
tree196d1d212e16fa2f7ddc9fee6a7ddfb3ed163c7etree | snapshot
parentaf27d9403f5b80685b79c88425086edccecaf711commit | diff
parent7bcfab202ca71bece02b283cdd104301c07eece4commit | diff
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
John Crispins staging tree