From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Jul 2021 20:31:08 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.14' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.15~824
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e72b069609aa76cc1de35f5d434dbfaa5392ae9a;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull dma-mapping updates from Christoph Hellwig:

 - a trivivial whitespace fix (Zhen Lei)

 - report -EEXIST errors in add_dma_entry (Hamza Mahfooz)

* tag 'dma-mapping-5.14' of git://git.infradead.org/users/hch/dma-mapping:
  dma-debug: report -EEXIST errors in add_dma_entry
  dma-mapping: remove a trailing space
---

e72b069609aa76cc1de35f5d434dbfaa5392ae9a