Merge tag 'apparmor-pr-2022-08-08' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 56ca13d..4b08856 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1390,10 +1390,14 @@ F:      include/uapi/linux/apm_bios.h
 
 APPARMOR SECURITY MODULE
 M:     John Johansen <john.johansen@canonical.com>
-L:     apparmor@lists.ubuntu.com (subscribers-only, general discussion)
+M:     John Johansen <john@apparmor.net>
+L:     apparmor@lists.ubuntu.com (moderated for non-subscribers)
 S:     Supported
-W:     wiki.apparmor.net
+W:     apparmor.net
+B:     https://gitlab.com/apparmor/apparmor-kernel
+C:     irc://irc.oftc.net/apparmor
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
+T:     https://gitlab.com/apparmor/apparmor-kernel.git
 F:     Documentation/admin-guide/LSM/apparmor.rst
 F:     security/apparmor/
 
@@ -4783,7 +4787,6 @@ L:        keyrings@vger.kernel.org
 S:     Maintained
 F:     Documentation/admin-guide/module-signing.rst
 F:     certs/
-F:     scripts/check-blacklist-hashes.awk
 F:     scripts/sign-file.c
 F:     tools/certs/
 
@@ -11063,6 +11066,7 @@ R:      Sergey Senozhatsky <senozhatsky@chromium.org>
 L:     linux-cifs@vger.kernel.org
 S:     Maintained
 T:     git git://git.samba.org/ksmbd.git
+F:     Documentation/filesystems/cifs/ksmbd.rst
 F:     fs/ksmbd/
 F:     fs/smbfs_common/