Merge tag 'dma-mapping-5.14' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jul 2021 20:31:08 +0000 (13:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jul 2021 20:31:08 +0000 (13:31 -0700)
commite72b069609aa76cc1de35f5d434dbfaa5392ae9a
tree367b92bae2ab968c8e5d2019ff82672368a14870
parentcd3eb7efaa995db00db0ba64893814f9831be842
parent2b4bbc6231d789f58676d2ccc42177df163e1c4a
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