Merge tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Apr 2018 18:48:09 +0000 (11:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Apr 2018 18:48:09 +0000 (11:48 -0700)
commit26ed24e429d89e045e5eb2d2b75215244347b7f2
treeebceef87144204fb10a6d7fc4ebb7be4718655de
parent3be4aaf4e2d3eb95cce7835e8df797ae65ae5ac1
parent60695be2bb6b0623f8e53bd9949d582a83c6d44a
Merge tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "A few small dma-mapping fixes for Linux 4.17-rc3:

   - don't loop to try GFP_DMA allocations if ZONE_DMA is not actually
     enabled (regression in 4.16)

   - don't try to do virt_to_page before we know we actuall have a valid
     page in dma_common_mmap

   - a comment fixup related to the above fix"

* tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: postpone cpu addr translation on mmap
  dma-coherent: clarify dma_mmap_from_dev_coherent documentation
  dma-direct: don't retry allocation for no-op GFP_DMA