Merge tag 'for-linus-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c745677..b80e6f7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7010,7 +7010,7 @@ F:        drivers/iommu/exynos-iommu.c
 
 F2FS FILE SYSTEM
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
-M:     Chao Yu <yuchao0@huawei.com>
+M:     Chao Yu <chao@kernel.org>
 L:     linux-f2fs-devel@lists.sourceforge.net
 S:     Maintained
 W:     https://f2fs.wiki.kernel.org/
@@ -14106,8 +14106,7 @@ F:      Documentation/devicetree/bindings/pci/aardvark-pci.txt
 F:     drivers/pci/controller/pci-aardvark.c
 
 PCI DRIVER FOR ALTERA PCIE IP
-M:     Ley Foon Tan <ley.foon.tan@intel.com>
-L:     rfi@lists.rocketboards.org (moderated for non-subscribers)
+M:     Joyce Ooi <joyce.ooi@intel.com>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/pci/altera-pcie.txt
@@ -14305,8 +14304,7 @@ S:      Supported
 F:     Documentation/PCI/pci-error-recovery.rst
 
 PCI MSI DRIVER FOR ALTERA MSI IP
-M:     Ley Foon Tan <ley.foon.tan@intel.com>
-L:     rfi@lists.rocketboards.org (moderated for non-subscribers)
+M:     Joyce Ooi <joyce.ooi@intel.com>
 L:     linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/pci/altera-pcie-msi.txt