From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 May 2021 17:52:09 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.13' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: baikal/mips/sdk5.9~11008
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=ecaa3fa6255d832cb1d53dd6feae7075a2e99ec8;p=kernel.git

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

Pull dma-mapping updates from Christoph Hellwig:

 - add a new dma_alloc_noncontiguous API (me, Ricardo Ribalda)

 - fix a copyright notice (Hao Fang)

 - add an unlikely annotation to dma_mapping_error (Heiner Kallweit)

 - remove a pointless empty line (Wang Qing)

 - add support for multi-pages map/unmap bencharking (Xiang Chen)

* tag 'dma-mapping-5.13' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: add unlikely hint to error path in dma_mapping_error
  dma-mapping: benchmark: Add support for multi-pages map/unmap
  dma-mapping: benchmark: use the correct HiSilicon copyright
  dma-mapping: remove a pointless empty line in dma_alloc_coherent
  media: uvcvideo: Use dma_alloc_noncontiguous API
  dma-iommu: implement ->alloc_noncontiguous
  dma-iommu: refactor iommu_dma_alloc_remap
  dma-mapping: add a dma_alloc_noncontiguous API
  dma-mapping: refactor dma_{alloc,free}_pages
  dma-mapping: add a dma_mmap_pages helper
---

ecaa3fa6255d832cb1d53dd6feae7075a2e99ec8