Merge tag 'modules-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof...

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index efb03e13c4043be066bbe8edf0f2f653a8ffcda2..a53a1a29b10cc3c635f754f999d3c98b7240ecb1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11601,16 +11601,6 @@ F:     include/linux/kmemleak.h
 F:     mm/kmemleak.c
 F:     samples/kmemleak/kmemleak-test.c
 
-KMOD KERNEL MODULE LOADER - USERMODE HELPER
-M:     Luis Chamberlain <mcgrof@kernel.org>
-L:     linux-kernel@vger.kernel.org
-L:     linux-modules@vger.kernel.org
-S:     Maintained
-F:     include/linux/kmod.h
-F:     kernel/kmod.c
-F:     lib/test_kmod.c
-F:     tools/testing/selftests/kmod/
-
 KMSAN
 M:     Alexander Potapenko <glider@google.com>
 R:     Marco Elver <elver@google.com>
@@ -14186,8 +14176,11 @@ L:     linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
 F:     include/linux/module.h
+F:     include/linux/kmod.h
 F:     kernel/module/
 F:     scripts/module*
+F:     lib/test_kmod.c
+F:     tools/testing/selftests/kmod/
 
 MONOLITHIC POWER SYSTEM PMIC DRIVER
 M:     Saravanan Sekar <sravanhome@gmail.com>