diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-01 18:17:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-01 18:17:33 +0200 |
| commit | 92367fdf3b699e97acb4d5fbf7159f5c458b2b30 (patch) | |
| tree | fba2fb439b8bad2c7aef25234d2356b75d4f80e5 /MAINTAINERS | |
| parent | media: i2c: imx290: fix conditional function defintions (diff) | |
| parent | iommu/vt-d: Fix an IOMMU perfmon warning when CPU hotplug (diff) | |
| download | linux-92367fdf3b699e97acb4d5fbf7159f5c458b2b30.tar.xz linux-92367fdf3b699e97acb4d5fbf7159f5c458b2b30.zip | |
Merge tag 'iommu-fixes-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
- Maintainer update for S390 IOMMU driver
- A fix for the set_platform_dma_ops() call-back in the Exynos
IOMMU driver
- Intel VT-d fixes from Lu Baolu:
- Fix a lockdep splat
- Fix a supplement of the specification
- Fix a warning in perfmon code
* tag 'iommu-fixes-6.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/vt-d: Fix an IOMMU perfmon warning when CPU hotplug
iommu/vt-d: Allow zero SAGAW if second-stage not supported
iommu/vt-d: Remove unnecessary locking in intel_irq_remapping_alloc()
iommu/exynos: Fix set_platform_dma_ops() callback
MAINTAINERS: Update s390-iommu driver maintainer information
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e01e546f3a90..26e5ad517532 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -18288,8 +18288,9 @@ F: drivers/s390/block/dasd* F: include/linux/dasd_mod.h S390 IOMMU (PCI) +M: Niklas Schnelle <schnelle@linux.ibm.com> M: Matthew Rosato <mjrosato@linux.ibm.com> -M: Gerald Schaefer <gerald.schaefer@linux.ibm.com> +R: Gerald Schaefer <gerald.schaefer@linux.ibm.com> L: linux-s390@vger.kernel.org S: Supported F: drivers/iommu/s390-iommu.c |