diff options
| author | Linus Torvalds | 2020-04-01 14:47:40 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-04-01 14:47:40 -0700 |
| commit | 72f35423e8a6a2451c202f52cb8adb92b08592ec (patch) | |
| tree | 2cc5c715631a59d51b6445143e03a187e8e394f6 /MAINTAINERS | |
| parent | 890f0b0d27dc400679b9a91d04ca44f5ee4c19c0 (diff) | |
| parent | fcb90d51c375d09a034993cda262b68499e233a4 (diff) | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu:
"API:
- Fix out-of-sync IVs in self-test for IPsec AEAD algorithms
Algorithms:
- Use formally verified implementation of x86/curve25519
Drivers:
- Enhance hwrng support in caam
- Use crypto_engine for skcipher/aead/rsa/hash in caam
- Add Xilinx AES driver
- Add uacce driver
- Register zip engine to uacce in hisilicon
- Add support for OCTEON TX CPT engine in marvell"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (162 commits)
crypto: af_alg - bool type cosmetics
crypto: arm[64]/poly1305 - add artifact to .gitignore files
crypto: caam - limit single JD RNG output to maximum of 16 bytes
crypto: caam - enable prediction resistance in HRWNG
bus: fsl-mc: add api to retrieve mc version
crypto: caam - invalidate entropy register during RNG initialization
crypto: caam - check if RNG job failed
crypto: caam - simplify RNG implementation
crypto: caam - drop global context pointer and init_done
crypto: caam - use struct hwrng's .init for initialization
crypto: caam - allocate RNG instantiation descriptor with GFP_DMA
crypto: ccree - remove duplicated include from cc_aead.c
crypto: chelsio - remove set but not used variable 'adap'
crypto: marvell - enable OcteonTX cpt options for build
crypto: marvell - add the Virtual Function driver for CPT
crypto: marvell - add support for OCTEON TX CPT engine
crypto: marvell - create common Kconfig and Makefile for Marvell
crypto: arm/neon - memzero_explicit aes-cbc key
crypto: bcm - Use scnprintf() for avoiding potential buffer overflow
crypto: atmel-i2c - Fix wakeup fail
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 195052943574..b76e11384c3b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4577,7 +4577,9 @@ S: Supported F: drivers/scsi/cxgbi/cxgb3i CXGB4 CRYPTO DRIVER (chcr) -M: Atul Gupta <atul.gupta@chelsio.com> +M: Ayush Sawal <ayush.sawal@chelsio.com> +M: Vinay Kumar Yadav <vinay.yadav@chelsio.com> +M: Rohit Maheshwari <rohitm@chelsio.com> L: linux-crypto@vger.kernel.org W: http://www.chelsio.com S: Supported @@ -10066,6 +10068,7 @@ F: Documentation/devicetree/bindings/phy/phy-mvebu-utmi.txt MARVELL CRYPTO DRIVER M: Boris Brezillon <bbrezillon@kernel.org> M: Arnaud Ebalard <arno@natisbad.org> +M: Srujana Challa <schalla@marvell.com> F: drivers/crypto/marvell/ S: Maintained L: linux-crypto@vger.kernel.org @@ -17139,6 +17142,18 @@ W: http://linuxtv.org S: Maintained F: drivers/media/pci/tw686x/ +UACCE ACCELERATOR FRAMEWORK +M: Zhangfei Gao <zhangfei.gao@linaro.org> +M: Zhou Wang <wangzhou1@hisilicon.com> +L: linux-accelerators@lists.ozlabs.org +L: linux-kernel@vger.kernel.org +S: Maintained +F: Documentation/ABI/testing/sysfs-driver-uacce +F: Documentation/misc-devices/uacce.rst +F: drivers/misc/uacce/ +F: include/linux/uacce.h +F: include/uapi/misc/uacce/ + UBI FILE SYSTEM (UBIFS) M: Richard Weinberger <richard@nod.at> L: linux-mtd@lists.infradead.org |