projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 485fc4b 9c24eaf)
Merge tag 'dma-mapping-5.4-2' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:29:04 +0000 (06:29 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 26 Oct 2019 10:29:04 +0000 (06:29 -0400)
Pull dma-mapping fix from Christoph Hellwig:
 "Fix a regression in the intel-iommu get_required_mask conversion
  (Arvind Sankar)"

* tag 'dma-mapping-5.4-2' of git://git.infradead.org/users/hch/dma-mapping:
  iommu/vt-d: Return the correct dma mask when we are bypassing the IOMMU


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