projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
John Crispins staging tree