David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
allwinner	crypto: sun8i-ce - fix description of stat_fb	2020-03-06 12:28:21 +11:00
amcc	crypto: crypto4xx - use GFP_KERNEL for big allocations	2020-01-09 11:30:53 +08:00
amlogic	crypto: amlogic - fix removal of module	2020-01-16 15:18:12 +08:00
axis	crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN	2020-01-09 11:30:53 +08:00
bcm	crypto: bcm - Use scnprintf() for avoiding potential buffer overflow	2020-03-20 14:36:51 +11:00
caam	crypto: caam - fix the address of the last entry of S/G	2020-04-16 16:48:56 +10:00
cavium	crypto: Replace zero-length array with flexible-array member	2020-03-06 12:28:21 +11:00
ccp	crypto: ccp - use file mode for sev ioctl permissions	2020-03-12 23:00:15 +11:00
ccree	crypto: ccree - remove duplicated include from cc_aead.c	2020-03-30 11:50:48 +11:00
chelsio	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-05-31 17:48:46 -07:00
hisilicon	crypto: hisilicon - Fix build error	2020-04-03 15:37:26 +11:00
inside-secure	crypto: remove propagation of CRYPTO_TFM_RES_* flags	2020-01-09 11:30:53 +08:00
marvell	crypto: marvell/octeontx - fix double free of ptr	2020-04-03 15:37:26 +11:00
mediatek	crypto: Replace zero-length array with flexible-array member	2020-03-06 12:28:21 +11:00
nx	crypto: Replace zero-length array with flexible-array member	2020-03-06 12:28:21 +11:00
qat	crypto: qat - simplify the qat_crypto function	2020-03-12 23:00:13 +11:00
qce	crypto: qce - fix wrong config symbol reference	2020-03-12 23:00:13 +11:00
rockchip	crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN	2020-01-09 11:30:53 +08:00
stm32	crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN	2020-01-09 11:30:53 +08:00
ux500	crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN	2020-01-09 11:30:53 +08:00
virtio	crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN	2020-01-09 11:30:53 +08:00
vmx	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
xilinx	crypto: xilinx - Add Xilinx AES driver	2020-02-28 08:36:46 +08:00
atmel-aes-regs.h
atmel-aes.c	crypto: atmel-{aes,sha,tdes} - Retire crypto_platform_data	2020-01-22 16:21:09 +08:00
atmel-authenc.h	crypto: remove propagation of CRYPTO_TFM_RES_* flags	2020-01-09 11:30:53 +08:00
atmel-ecc.c
atmel-i2c.c	crypto: atmel-i2c - Fix wakeup fail	2020-03-20 14:36:51 +11:00
atmel-i2c.h
atmel-sha204a.c
atmel-sha-regs.h
atmel-sha.c	crypto: atmel-{aes,sha,tdes} - Retire crypto_platform_data	2020-01-22 16:21:09 +08:00
atmel-tdes-regs.h
atmel-tdes.c	crypto: atmel-{aes,sha,tdes} - Retire crypto_platform_data	2020-01-22 16:21:09 +08:00
exynos-rng.c
geode-aes.c	crypto: remove propagation of CRYPTO_TFM_RES_* flags	2020-01-09 11:30:53 +08:00
geode-aes.h
hifn_795x.c	remove ioremap_nocache and devm_ioremap_nocache	2020-01-06 09:45:59 +01:00
img-hash.c	crypto: img-hash - Replace zero-length array with flexible-array member	2020-02-22 09:25:48 +08:00
ixp4xx_crypto.c	crypto: remove CRYPTO_TFM_RES_WEAK_KEY	2020-01-09 11:30:53 +08:00
Kconfig	crypto: marvell - create common Kconfig and Makefile for Marvell	2020-03-20 14:36:51 +11:00
Makefile	crypto: marvell - create common Kconfig and Makefile for Marvell	2020-03-20 14:36:51 +11:00
mxs-dcp.c	crypto: mxs-dcp - fix scatterlist linearization for hash	2020-03-06 12:28:21 +11:00
n2_asm.S
n2_core.c	crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN	2020-01-09 11:30:53 +08:00
n2_core.h
omap-aes-gcm.c
omap-aes.c
omap-aes.h
omap-crypto.c	crypto: omap-crypto - copy the temporary data to output buffer properly	2019-12-11 16:37:00 +08:00
omap-crypto.h
omap-des.c
omap-sham.c	crypto: Replace zero-length array with flexible-array member	2020-03-06 12:28:21 +11:00
padlock-aes.c	crypto: Convert to new CPU match macros	2020-03-24 21:36:06 +01:00
padlock-sha.c	crypto: Convert to new CPU match macros	2020-03-24 21:36:06 +01:00
picoxcell_crypto_regs.h
picoxcell_crypto.c	crypto: remove propagation of CRYPTO_TFM_RES_* flags	2020-01-09 11:30:53 +08:00
qcom-rng.c
s5p-sss.c	crypto: s5p-sss - Replace zero-length array with flexible-array member	2020-02-22 09:25:48 +08:00
sahara.c	crypto: remove propagation of CRYPTO_TFM_RES_* flags	2020-01-09 11:30:53 +08:00
talitos.c	crypto: remove CRYPTO_TFM_RES_BAD_KEY_LEN	2020-01-09 11:30:53 +08:00
talitos.h