diff mbox

MAINTAINERS: update the IMA, EVM, trusted-keys, encrypted-keys entries

Message ID 1509721716.3416.51.camel@linux.vnet.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mimi Zohar Nov. 3, 2017, 3:08 p.m. UTC 
Hi James,

With all the changes to MAINTAINERS there's a conflict with the patch
in my next branch.  Could you carry this patch?

thanks,

Mimi
---

Update the mailing list information.

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
---
 MAINTAINERS | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Comments

James Morris Nov. 5, 2017, 3:22 p.m. UTC | #1 
On Fri, 3 Nov 2017, Mimi Zohar wrote:

> Hi James,
> 
> With all the changes to MAINTAINERS there's a conflict with the patch
> in my next branch.  Could you carry this patch?

Applied to:

git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-general
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 2c43cfabd438..1b41b99be98e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5213,8 +5213,7 @@  F:	fs/ext4/
 
 Extended Verification Module (EVM)
 M:	Mimi Zohar <zohar@linux.vnet.ibm.com>
-L:	linux-ima-devel@lists.sourceforge.net
-L:	linux-security-module@vger.kernel.org
+L:	linux-integrity@vger.kernel.org
 S:	Supported
 F:	security/integrity/evm/
 
@@ -6840,9 +6839,7 @@  L:	linux-crypto@vger.kernel.org
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 M:	Mimi Zohar <zohar@linux.vnet.ibm.com>
 M:	Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
-L:	linux-ima-devel@lists.sourceforge.net
-L:	linux-ima-user@lists.sourceforge.net
-L:	linux-security-module@vger.kernel.org
+L:	linux-integrity@vger.kernel.org
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
 S:	Supported
 F:	security/integrity/ima/
@@ -7625,7 +7622,7 @@  F:	kernel/kexec*
 
 KEYS-ENCRYPTED
 M:	Mimi Zohar <zohar@linux.vnet.ibm.com>
-L:	linux-security-module@vger.kernel.org
+L:	linux-integrity@vger.kernel.org
 L:	keyrings@vger.kernel.org
 S:	Supported
 F:	Documentation/security/keys/trusted-encrypted.rst
@@ -7634,7 +7631,7 @@  F:	security/keys/encrypted-keys/
 
 KEYS-TRUSTED
 M:	Mimi Zohar <zohar@linux.vnet.ibm.com>
-L:	linux-security-module@vger.kernel.org
+L:	linux-integrity@vger.kernel.org
 L:	keyrings@vger.kernel.org
 S:	Supported
 F:	Documentation/security/keys/trusted-encrypted.rst