]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9463cb4 c6e2e37)
Merge tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2018 00:55:16 +0000 (17:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2018 00:55:16 +0000 (17:55 -0700)
commit0935a99e5153af8219129bfe488d05091d38f5f8
treedcd27d87a620ef89bdf70aa71de33bd36ec93df7tree | snapshot
parent9463cb4ca8dcc6699417b9f3b7af3b30198f5c8bcommit | diff
parentc6e2e37d448d69984397978ba1be4c28dbaab7f9commit | diff
Merge tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Revert an incorrect dma-mapping commit for 4.18-rc"

* tag 'dma-mapping-4.18-3' of git://git.infradead.org/users/hch/dma-mapping:
  Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()"
Linux Kernel Source Tree.