Merge tag 'dma-mapping-5.9' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2020 00:29:57 +0000 (17:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2020 00:29:57 +0000 (17:29 -0700)
commit2ed90dbbf7be3b7cd2790fc6fa946c478ab496b8
tree05bdc7c3d5164836b3a64016c79c90b6f21d2962
parent9fa867d2acbca6c4cd317ab75c0e94e1703af2b0
parent274b3f7bf34415eed106e479e4815e897ce5d763
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
arch/arm/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/s390/Kconfig
arch/x86/Kconfig
include/linux/device.h
kernel/dma/debug.c