]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ef383a 66b60ce)
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)
commit3e4cf5624c40b7cf88eac4b74143bbe634a8aae3
treedcd27d87a620ef89bdf70aa71de33bd36ec93df7tree | snapshot
parent3ef383a6018df8ce3d8c50482009f5966989c744commit | diff
parent66b60cedbae642f22adc3e00243156d70f1a9750commit | 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.