projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e02677 d17405d)
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)
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


Trivial merge
Linux 6.x block layer and io_uring tree(s)