projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 62393db c92a54c)
Merge tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2018 02:16:17 +0000 (18:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Dec 2018 02:16:17 +0000 (18:16 -0800)
commit2dd516ff7d852c2cda8c5b883d6625d1c812714e
tree83f0f72134a7b610940505c4ee4f2fcbc0d45a52tree | snapshot
parent62393dbcbe0f3001691e4bd479a25beb5941f2edcommit | diff
parentc92a54cfa0257e8ffd66b2a17d49e9c0bd4b769fcommit | diff
Merge tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix a regression in dma-direct that didn't take account the magic AMD
  memory encryption mask in the DMA address"

* tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: do not include SME mask in the DMA supported check
Linux 6.x block layer and io_uring tree(s)