diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 21:19:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 21:19:13 +0200 |
| commit | 8f02f363f76f99f08117336cfac7f24c76b25be3 (patch) | |
| tree | b32e764508b3eb8e3c90e6deaacf980792dea854 /MAINTAINERS | |
| parent | Merge tag 'printk-for-5.8-kdb-nmi' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | iommu/vt-d: Move Intel IOMMU driver into subdirectory (diff) | |
| download | linux-8f02f363f76f99f08117336cfac7f24c76b25be3.tar.xz linux-8f02f363f76f99f08117336cfac7f24c76b25be3.zip | |
Merge tag 'iommu-drivers-move-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu driver directory structure cleanup from Joerg Roedel:
"Move the Intel and AMD IOMMU drivers into their own subdirectory.
Both drivers consist of several files by now and giving them their own
directory unclutters the IOMMU top-level directory a bit"
* tag 'iommu-drivers-move-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Move Intel IOMMU driver into subdirectory
iommu/amd: Move AMD IOMMU driver into subdirectory
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 58bc99a57d95..b0642aaa146e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -884,7 +884,7 @@ M: Joerg Roedel <joro@8bytes.org> L: iommu@lists.linux-foundation.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git -F: drivers/iommu/amd_iommu*.[ch] +F: drivers/iommu/amd/ F: include/linux/amd-iommu.h AMD KFD @@ -8735,8 +8735,7 @@ M: Lu Baolu <baolu.lu@linux.intel.com> L: iommu@lists.linux-foundation.org S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git -F: drivers/iommu/dmar.c -F: drivers/iommu/intel*.[ch] +F: drivers/iommu/intel/ F: include/linux/intel-iommu.h F: include/linux/intel-svm.h |