summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2018-01-24 21:53:57 +0100
committerJames Morris <jmorris@namei.org>2018-01-24 21:53:57 +0100
commit3eab2ad9162e7467c988b91f50395eac51a1e650 (patch)
tree280ab50bc243f4c77a0d63cdbf0043297de75c6a /MAINTAINERS
parentMerge tag 'trace-v4.15-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-3eab2ad9162e7467c988b91f50395eac51a1e650.tar.xz
linux-3eab2ad9162e7467c988b91f50395eac51a1e650.zip
MAINTAINERS: update email address for James Morris
Update my email address. Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to '')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fec88c5ccedf..810d5d990f4a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12241,7 +12241,7 @@ M: Security Officers <security@kernel.org>
S: Supported
SECURITY SUBSYSTEM
-M: James Morris <james.l.morris@oracle.com>
+M: James Morris <jmorris@namei.org>
M: "Serge E. Hallyn" <serge@hallyn.com>
L: linux-security-module@vger.kernel.org (suggested Cc:)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git