aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-03 13:44:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-03 13:44:29 -0800
commit1726aa70e7e2f8967d60b4f836723b61f97db73e (patch)
tree0f516117fb85498cc89c08142f98305bcec25cae /MAINTAINERS
parentc80c238a28b8a3b2f35898e9a49d9516f7d54346 (diff)
parente2598077dc6a26c9644393e5c21f22a90dbdccdb (diff)
downloadlinux-stericsson-1726aa70e7e2f8967d60b4f836723b61f97db73e.tar.gz
Merge branch 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull integrity fixes from James Morris: - add James Bottommley as a Trusted Keys maintainer. - IMA: re-initialize iint->atomic_flags on iint_free(), from Mimi. * 'fixes-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: ima: re-initialize iint->atomic_flags maintainers: update trusted keys
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cd0e9c763bd8..f3bac2a8c6d6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7795,6 +7795,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