From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Sep 2021 18:54:48 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.15-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b9b11b133b4a0b4f8dc36ec04d81d630f763eaa6;p=linux.git

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

Pull dma-mapping fixes from Christoph Hellwig:

 - page align size in sparc32 arch_dma_alloc (Andreas Larsson)

 - tone down a new dma-debug message (Hamza Mahfooz)

 - fix the kerneldoc for dma_map_sg_attrs (me)

* tag 'dma-mapping-5.15-1' of git://git.infradead.org/users/hch/dma-mapping:
  sparc32: page align size in arch_dma_alloc
  dma-debug: prevent an error message from causing runtime problems
  dma-mapping: fix the kerneldoc for dma_map_sg_attrs
---

b9b11b133b4a0b4f8dc36ec04d81d630f763eaa6