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@xxxxxxxxxxxxxxxxxx> --- MAINTAINERS | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) 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@xxxxxxxxxxxxxxxxxx> -L: linux-ima-devel@xxxxxxxxxxxxxxxxxxxxx -L: linux-security-module@xxxxxxxxxxxxxxx +L: linux-integrity@xxxxxxxxxxxxxxx S: Supported F: security/integrity/evm/ @@ -6840,9 +6839,7 @@ L: linux-crypto@xxxxxxxxxxxxxxx INTEGRITY MEASUREMENT ARCHITECTURE (IMA) M: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> M: Dmitry Kasatkin <dmitry.kasatkin@xxxxxxxxx> -L: linux-ima-devel@xxxxxxxxxxxxxxxxxxxxx -L: linux-ima-user@xxxxxxxxxxxxxxxxxxxxx -L: linux-security-module@xxxxxxxxxxxxxxx +L: linux-integrity@xxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxxxxx> -L: linux-security-module@xxxxxxxxxxxxxxx +L: linux-integrity@xxxxxxxxxxxxxxx L: keyrings@xxxxxxxxxxxxxxx S: Supported F: Documentation/security/keys/trusted-encrypted.rst @@ -7634,7 +7631,7 @@ F: security/keys/encrypted-keys/ KEYS-TRUSTED M: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> -L: linux-security-module@xxxxxxxxxxxxxxx +L: linux-integrity@xxxxxxxxxxxxxxx L: keyrings@xxxxxxxxxxxxxxx S: Supported F: Documentation/security/keys/trusted-encrypted.rst -- 2.7.4
