Merge tag 'riscv/for-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0d0d5c03f770d39610601576abcefa80c9c08d35..500cdb68ccbc9480086015dde5f1d34265550d4d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3765,7 +3765,7 @@ F:        arch/powerpc/platforms/cell/
 
 CEPH COMMON CODE (LIBCEPH)
 M:     Ilya Dryomov <idryomov@gmail.com>
-M:     "Yan, Zheng" <zyan@redhat.com>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     Sage Weil <sage@redhat.com>
 L:     ceph-devel@vger.kernel.org
 W:     http://ceph.com/
@@ -3777,7 +3777,7 @@ F:        include/linux/ceph/
 F:     include/linux/crush/
 
 CEPH DISTRIBUTED FILE SYSTEM CLIENT (CEPH)
-M:     "Yan, Zheng" <zyan@redhat.com>
+M:     Jeff Layton <jlayton@kernel.org>
 M:     Sage Weil <sage@redhat.com>
 M:     Ilya Dryomov <idryomov@gmail.com>
 L:     ceph-devel@vger.kernel.org
@@ -12840,6 +12840,7 @@ F:      drivers/base/power/
 F:     include/linux/pm.h
 F:     include/linux/pm_*
 F:     include/linux/powercap.h
+F:     include/linux/intel_rapl.h
 F:     drivers/powercap/
 F:     kernel/configs/nopm.config
 
@@ -13719,7 +13720,7 @@ RISC-V ARCHITECTURE
 M:     Palmer Dabbelt <palmer@sifive.com>
 M:     Albert Ou <aou@eecs.berkeley.edu>
 L:     linux-riscv@lists.infradead.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
 S:     Supported
 F:     arch/riscv/
 K:     riscv
@@ -14581,7 +14582,7 @@ M:      Paul Walmsley <paul.walmsley@sifive.com>
 L:     linux-riscv@lists.infradead.org
 T:     git git://github.com/sifive/riscv-linux.git
 S:     Supported
-K:     sifive
+K:     [^@]sifive
 N:     sifive
 
 SIFIVE FU540 SYSTEM-ON-CHIP
@@ -17650,9 +17651,8 @@ L:      linux-xfs@vger.kernel.org
 W:     http://xfs.org/
 T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 S:     Supported
-F:     Documentation/filesystems/xfs.txt
+F:     Documentation/admin-guide/xfs.rst
 F:     Documentation/ABI/testing/sysfs-fs-xfs
-F:     Documentation/filesystems/xfs.txt
 F:     Documentation/filesystems/xfs-delayed-logging-design.txt
 F:     Documentation/filesystems/xfs-self-describing-metadata.txt
 F:     fs/xfs/