diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:30:01 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-20 16:30:01 +0900 |
| commit | 6d90eb7ba341b3eb035121eff0b69d370cbc251e (patch) | |
| tree | 332809825f5aab97e839ab4534e5b81fb28e0c84 /MAINTAINERS | |
| parent | f5b65348fd77839b50e79bc0a5e536832ea52d8d (diff) | |
| parent | cf65a0f6f6ff7631ba0ac0513a14ca5b65320d80 (diff) | |
Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping rename from Christoph Hellwig:
"Move all the dma-mapping code to kernel/dma and lose their dma-*
prefixes"
* tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping:
dma-mapping: move all DMA mapping code to kernel/dma
dma-mapping: use obj-y instead of lib-y for generic dma ops
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 624c3fd11d04..1d7d648d8aad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4360,12 +4360,7 @@ L: iommu@lists.linux-foundation.org T: git git://git.infradead.org/users/hch/dma-mapping.git W: http://git.infradead.org/users/hch/dma-mapping.git S: Supported -F: lib/dma-debug.c -F: lib/dma-direct.c -F: lib/dma-noncoherent.c -F: lib/dma-virt.c -F: drivers/base/dma-mapping.c -F: drivers/base/dma-coherent.c +F: kernel/dma/ F: include/asm-generic/dma-mapping.h F: include/linux/dma-direct.h F: include/linux/dma-mapping.h @@ -13648,7 +13643,7 @@ M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> L: iommu@lists.linux-foundation.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git S: Supported -F: lib/swiotlb.c +F: kernel/dma/swiotlb.c F: arch/*/kernel/pci-swiotlb.c F: include/linux/swiotlb.h |