Merge tag 'dma-mapping-5.11-1' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2021 18:40:20 +0000 (10:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Feb 2021 18:40:20 +0000 (10:40 -0800)
commit7d36ccd4bd07825775b512f654566d3e89e9cfd0
tree1014da872463862b14af3b195eadd271ad5ba550
parent2e02677e961fd4b96d8cf106b5979e6a3cdb7362
parentd17405d52bacd14fe7fdbb10c0434934ea496914
Merge tag 'dma-mapping-5.11-1' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix a kernel crash in the new dma-mapping benchmark test (Barry Song)"

* tag 'dma-mapping-5.11-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: benchmark: fix kernel crash when dma_map_single fails