Merge tag 'mm-nonmm-stable-2022-05-26' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 41c9c8f..58548f7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5056,6 +5056,7 @@ M:        Johannes Weiner <hannes@cmpxchg.org>
 M:     Michal Hocko <mhocko@kernel.org>
 M:     Roman Gushchin <roman.gushchin@linux.dev>
 M:     Shakeel Butt <shakeelb@google.com>
+R:     Muchun Song <songmuchun@bytedance.com>
 L:     cgroups@vger.kernel.org
 L:     linux-mm@kvack.org
 S:     Maintained
@@ -16097,7 +16098,6 @@ F:      include/asm-generic/syscall.h
 F:     include/linux/ptrace.h
 F:     include/linux/regset.h
 F:     include/uapi/linux/ptrace.h
-F:     include/uapi/linux/ptrace.h
 F:     kernel/ptrace.c
 
 PULSE8-CEC DRIVER