summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMimi Zohar2014-02-27 14:44:45 +0100
committerMimi Zohar2014-03-07 17:32:31 +0100
commit74dd744fd7f7492a52cf2f0312640ae714bd8180 (patch)
treec915b93e108142100c2b66dff02605b2ac864223 /MAINTAINERS
parentima: reduce memory usage when a template containing the n field is used (diff)
downloadkernel-qcow2-linux-74dd744fd7f7492a52cf2f0312640ae714bd8180.tar.gz
kernel-qcow2-linux-74dd744fd7f7492a52cf2f0312640ae714bd8180.tar.xz
kernel-qcow2-linux-74dd744fd7f7492a52cf2f0312640ae714bd8180.zip
MAINTAINERS: email updates and other misc. changes
Changes for Trusted/Encrypted keys, EVM, and IMA. Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS17
1 files changed, 11 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e401b801ca5d..576816dcb6cd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3325,7 +3325,9 @@ F: Documentation/filesystems/ext4.txt
F: fs/ext4/
Extended Verification Module (EVM)
-M: Mimi Zohar <zohar@us.ibm.com>
+M: Mimi Zohar <zohar@linux.vnet.ibm.com>
+L: linux-ima-devel@lists.sourceforge.net
+L: linux-security-module@vger.kernel.org
S: Supported
F: security/integrity/evm/
@@ -4339,8 +4341,11 @@ S: Maintained
F: drivers/ipack/
INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-M: Mimi Zohar <zohar@us.ibm.com>
+M: Mimi Zohar <zohar@linux.vnet.ibm.com>
M: Dmitry Kasatkin <d.kasatkin@samsung.com>
+L: linux-ima-devel@lists.sourceforge.net
+L: linux-ima-user@lists.sourceforge.net
+L: linux-security-module@vger.kernel.org
S: Supported
F: security/integrity/ima/
@@ -5003,8 +5008,8 @@ F: include/keys/
F: security/keys/
KEYS-TRUSTED
-M: David Safford <safford@watson.ibm.com>
-M: Mimi Zohar <zohar@us.ibm.com>
+M: David Safford <safford@us.ibm.com>
+M: Mimi Zohar <zohar@linux.vnet.ibm.com>
L: linux-security-module@vger.kernel.org
L: keyrings@linux-nfs.org
S: Supported
@@ -5014,8 +5019,8 @@ F: security/keys/trusted.c
F: security/keys/trusted.h
KEYS-ENCRYPTED
-M: Mimi Zohar <zohar@us.ibm.com>
-M: David Safford <safford@watson.ibm.com>
+M: Mimi Zohar <zohar@linux.vnet.ibm.com>
+M: David Safford <safford@us.ibm.com>
L: linux-security-module@vger.kernel.org
L: keyrings@linux-nfs.org
S: Supported