From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 Aug 2020 00:29:57 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.9' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: xarray-5.9~316
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2ed90dbbf7be3b7cd2790fc6fa946c478ab496b8;p=users%2Fwilly%2Fxarray.git

Merge tag 'dma-mapping-5.9' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - make support for dma_ops optional

 - move more code out of line

 - add generic support for a dma_ops bypass mode

 - misc cleanups

* tag 'dma-mapping-5.9' of git://git.infradead.org/users/hch/dma-mapping:
  dma-contiguous: cleanup dma_alloc_contiguous
  dma-debug: use named initializers for dir2name
  powerpc: use the generic dma_ops_bypass mode
  dma-mapping: add a dma_ops_bypass flag to struct device
  dma-mapping: make support for dma ops optional
  dma-mapping: inline the fast path dma-direct calls
  dma-mapping: move the remaining DMA API calls out of line
---

2ed90dbbf7be3b7cd2790fc6fa946c478ab496b8