From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Oct 2021 20:16:51 +0000 (-1000)
Subject: Merge tag 'dma-mapping-5.15-2' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: accepted/tizen/unified/20230118.172025~6150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=515dcc2e02178ea8af2ea53b4ae5bdb6875b53ef;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull dma-mapping fixes from Christoph Hellwig:

 - fix more dma-debug fallout (Gerald Schaefer, Hamza Mahfooz)

 - fix a kerneldoc warning (Logan Gunthorpe)

* tag 'dma-mapping-5.15-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-debug: teach add_dma_entry() about DMA_ATTR_SKIP_CPU_SYNC
  dma-debug: fix sg checks in debug_dma_map_sg()
  dma-mapping: fix the kerneldoc for dma_map_sgtable()
---

515dcc2e02178ea8af2ea53b4ae5bdb6875b53ef