Merge tag 'arc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e2a8ad6..bf7ba6d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6652,13 +6652,6 @@ L:       iommu@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/iommu/exynos-iommu.c
 
-EZchip NPS platform support
-M:     Vineet Gupta <vgupta@synopsys.com>
-M:     Ofer Levi <oferle@nvidia.com>
-S:     Supported
-F:     arch/arc/boot/dts/eznps.dts
-F:     arch/arc/plat-eznps
-
 F2FS FILE SYSTEM
 M:     Jaegeuk Kim <jaegeuk@kernel.org>
 M:     Chao Yu <yuchao0@huawei.com>
@@ -7238,7 +7231,7 @@ FUSE: FILESYSTEM IN USERSPACE
 M:     Miklos Szeredi <miklos@szeredi.hu>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
-W:     http://fuse.sourceforge.net/
+W:     https://github.com/libfuse/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
 F:     Documentation/filesystems/fuse.rst
 F:     fs/fuse/
@@ -17672,8 +17665,9 @@ S:      Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git dev
 F:     Documentation/RCU/torture.rst
 F:     kernel/locking/locktorture.c
-F:     kernel/rcu/rcuperf.c
+F:     kernel/rcu/rcuscale.c
 F:     kernel/rcu/rcutorture.c
+F:     kernel/rcu/refscale.c
 F:     kernel/torture.c
 
 TOSHIBA ACPI EXTRAS DRIVER