From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Mar 2023 23:09:37 +0000 (-0700)
Subject: Merge tag 'dma-mapping-6.3-2023-03-31' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v6.6.17~5219
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62bad54b26db8bc98e28749cd76b2d890edb4258;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'dma-mapping-6.3-2023-03-31' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:

 - fix for swiotlb deadlock due to wrong alignment checks (GuoRui.Yu,
   Petr Tesarik)

* tag 'dma-mapping-6.3-2023-03-31' of git://git.infradead.org/users/hch/dma-mapping:
  swiotlb: fix slot alignment checks
  swiotlb: use wrap_area_index() instead of open-coding it
  swiotlb: fix the deadlock in swiotlb_do_find_slots
---

62bad54b26db8bc98e28749cd76b2d890edb4258