From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 Apr 2018 18:48:09 +0000 (-0700)
Subject: Merge tag 'dma-mapping-4.17-3' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=26ed24e429d89e045e5eb2d2b75215244347b7f2;p=openwrt%2Fstaging%2Fblogic.git

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
---

26ed24e429d89e045e5eb2d2b75215244347b7f2