Merge tag 'dma-mapping-5.15-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 20:16:51 +0000 (10:16 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Oct 2021 20:16:51 +0000 (10:16 -1000)
commit515dcc2e02178ea8af2ea53b4ae5bdb6875b53ef
treefd5fa34a2427ea346992d56ea755a6d1286f6e26
parent8e37395c3a5dceff62a5010ebbbc107f4145935c
parentc2bbf9d1e9ac7d4fdd503b190bc1ba8a6302bc49
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()