From 94f32d92cfaa4c01ebb1ece0c7014c37ae8e27c8 Mon Sep 17 00:00:00 2001 From: Gilad Ben-Yossef Date: Mon, 22 Jan 2018 09:27:05 +0000 Subject: MAINTAINERS: update ccree entry Update Arm TrustZone CryptoCell driver entry move into drivers/crypto/ Signed-off-by: Gilad Ben-Yossef Signed-off-by: Herbert Xu --- MAINTAINERS | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 3bdc260e36b7..eb9969347404 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3282,12 +3282,11 @@ F: drivers/net/ieee802154/cc2520.c F: include/linux/spi/cc2520.h F: Documentation/devicetree/bindings/net/ieee802154/cc2520.txt -CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER +CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER M: Gilad Ben-Yossef L: linux-crypto@vger.kernel.org -L: driverdev-devel@linuxdriverproject.org S: Supported -F: drivers/staging/ccree/ +F: drivers/crypto/ccree/ W: https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family CEC FRAMEWORK -- cgit v1.2.3 From b09dd34705442cb3e6f26728baef664adaa6a510 Mon Sep 17 00:00:00 2001 From: Tim Chen Date: Mon, 29 Jan 2018 09:22:41 -0800 Subject: x86/crypto: Designate maintainer for SHA-1/256/512 multibuffer driver Even though I created the original implementation of SHA1 multibuffer driver, Megha extended it to SHA256 and SHA512 and she is now maintaining the code for SHA1/SHA256/SHA512 multi-buffer driver. Add the entry in the MAINTAINERS file so any update patch can find its way properly to Megha. Signed-off-by: Tim Chen Signed-off-by: Herbert Xu --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index eb9969347404..d30e36ddfdac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7226,6 +7226,14 @@ L: linux-rdma@vger.kernel.org S: Supported F: drivers/infiniband/hw/i40iw/ +INTEL SHA MULTIBUFFER DRIVER +M: Megha Dey +R: Tim Chen +L: linux-crypto@vger.kernel.org +S: Supported +F: arch/x86/crypto/sha*-mb +F: crypto/mcryptd.c + INTEL TELEMETRY DRIVER M: Souvik Kumar Chakravarty L: platform-driver-x86@vger.kernel.org -- cgit v1.2.3 From c4ecc8f0bdced702ae502529f9fb70545fe556a5 Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Tue, 13 Feb 2018 09:26:50 +0100 Subject: MAINTAINERS: update the Inside Secure maintainer email Free Electrons became Bootlin. Update my email accordingly. Signed-off-by: Antoine Tenart Signed-off-by: Herbert Xu --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index d30e36ddfdac..3a03eaa7544e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6989,7 +6989,7 @@ F: drivers/input/input-mt.c K: \b(ABS|SYN)_MT_ INSIDE SECURE CRYPTO DRIVER -M: Antoine Tenart +M: Antoine Tenart F: drivers/crypto/inside-secure/ S: Maintained L: linux-crypto@vger.kernel.org -- cgit v1.2.3