aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2018-01-31 22:14:36 -0500
committerJames Morris <jmorris@namei.org>2018-02-02 21:02:32 +1100
commit7825cd83fad7a30328bc874062eb19bdb2fbb38b (patch)
tree546b79d924647100003fcf466134693df376c0a0 /MAINTAINERS
parentMerge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux (diff)
downloadlinux-dev-7825cd83fad7a30328bc874062eb19bdb2fbb38b.tar.xz
linux-dev-7825cd83fad7a30328bc874062eb19bdb2fbb38b.zip
maintainers: update trusted keys
Adding James Bottomley as the new maintainer for trusted keys. Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4c104dbc746d..10ba3682d0fa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7792,6 +7792,7 @@ F: include/keys/encrypted-type.h
F: security/keys/encrypted-keys/
KEYS-TRUSTED
+M: James Bottomley <jejb@linux.vnet.ibm.com>
M: Mimi Zohar <zohar@linux.vnet.ibm.com>
L: linux-integrity@vger.kernel.org
L: keyrings@vger.kernel.org