Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e64e5db314976dc9f73107c9bd616aeaa3dd9c70..e9e94eacd6f34975ddbcc83204ab38c115d68978 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9181,6 +9181,17 @@ F:       Documentation/kbuild/kconfig*
 F:     scripts/Kconfig.include
 F:     scripts/kconfig/
 
+KCSAN
+M:     Marco Elver <elver@google.com>
+R:     Dmitry Vyukov <dvyukov@google.com>
+L:     kasan-dev@googlegroups.com
+S:     Maintained
+F:     Documentation/dev-tools/kcsan.rst
+F:     include/linux/kcsan*.h
+F:     kernel/kcsan/
+F:     lib/Kconfig.kcsan
+F:     scripts/Makefile.kcsan
+
 KDUMP
 M:     Dave Young <dyoung@redhat.com>
 M:     Baoquan He <bhe@redhat.com>