From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Jun 2023 04:12:20 +0000 (-0700)
Subject: Merge tag 'dma-mapping-6.5-2023-06-28' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v6.5-rc1~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e6d5dea34325df8dc204575cd0726cd5f2b864f;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'dma-mapping-6.5-2023-06-28' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping updates from Christoph Hellwig:

 - swiotlb cleanups (Petr Tesarik)

 - use kvmalloc_array (gaoxu)

 - a small step towards removing is_swiotlb_active (Christoph Hellwig)

 - fix a Kconfig typo Sui Jingfeng)

* tag 'dma-mapping-6.5-2023-06-28' of git://git.infradead.org/users/hch/dma-mapping:
  drm/nouveau: stop using is_swiotlb_active
  swiotlb: use the atomic counter of total used slabs if available
  swiotlb: remove unused field "used" from struct io_tlb_mem
  dma-remap: use kvmalloc_array/kvfree for larger dma memory remap
  dma-mapping: fix a Kconfig typo
---

1e6d5dea34325df8dc204575cd0726cd5f2b864f