David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
amcc	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
axis	crypto: axis - fix platform_no_drv_owner.cocci warnings	2018-10-12 14:20:44 +08:00
bcm	crypto: bcm - convert to use crypto_authenc_extractkeys()	2019-01-10 21:37:31 +08:00
caam	crypto: caam - fix SHA support detection	2019-01-10 21:37:31 +08:00
cavium	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2019-01-31 23:09:00 -08:00
ccp	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
ccree	crypto: ccree - convert to use crypto_authenc_extractkeys()	2019-01-10 21:37:31 +08:00
chelsio	net/tls: free ctx in sock destruct	2019-01-22 11:30:54 -08:00
hisilicon	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
inside-secure	crypto: inside-secure - remove useless setting of type flags	2018-11-20 14:26:55 +08:00
marvell	…
mediatek	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
nx	crypto: skcipher - remove remnants of internal IV generators	2018-12-23 11:52:45 +08:00
qat	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
qce	crypto: remove useless initializations of cra_list	2018-11-20 14:26:55 +08:00
rockchip	…
stm32	Char/Misc driver patches for 4.19-rc1	2018-08-18 11:04:51 -07:00
sunxi-ss	…
ux500	crypto: ux500 - Use proper enum in hash_set_dma_transfer	2018-12-23 11:52:43 +08:00
virtio	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-08-15 16:01:47 -07:00
vmx	crypto: vmx - Remove VLA usage of skcipher	2018-09-28 12:46:08 +08:00
Kconfig	crypto: bcm - convert to use crypto_authenc_extractkeys()	2019-01-10 21:37:31 +08:00
Makefile	crypto: caam/qi2 - add DPAA2-CAAM driver	2018-09-21 13:24:51 +08:00
atmel-aes-regs.h	…
atmel-aes.c	crypto: atmel - switch to SPDX license identifiers	2018-09-04 11:37:04 +08:00
atmel-authenc.h	crypto: atmel - switch to SPDX license identifiers	2018-09-04 11:37:04 +08:00
atmel-ecc.c	crypto: atmel - switch to SPDX license identifiers	2018-09-04 11:37:04 +08:00
atmel-ecc.h	crypto: atmel - switch to SPDX license identifiers	2018-09-04 11:37:04 +08:00
atmel-sha-regs.h	…
atmel-sha.c	crypto: atmel - switch to SPDX license identifiers	2018-09-04 11:37:04 +08:00
atmel-tdes-regs.h	…
atmel-tdes.c	crypto: atmel - switch to SPDX license identifiers	2018-09-04 11:37:04 +08:00
exynos-rng.c	…
geode-aes.c	crypto: drop mask=CRYPTO_ALG_ASYNC from 'cipher' tfm allocations	2018-11-20 14:26:55 +08:00
geode-aes.h	…
hifn_795x.c	…
img-hash.c	…
ixp4xx_crypto.c	cross-tree: phase out dma_zalloc_coherent()	2019-01-08 07:58:37 -05:00
mxc-scc.c	crypto: mxc-scc - fix build warnings on ARM64	2018-12-23 11:52:44 +08:00
mxs-dcp.c	crypto: mxs-dcp - Add support for dcp clk	2018-11-16 14:11:03 +08:00
n2_asm.S	…
n2_core.c	…
n2_core.h	…
omap-aes-gcm.c	…
omap-aes.c	crypto: skcipher - remove remnants of internal IV generators	2018-12-23 11:52:45 +08:00
omap-aes.h	crypto: omap-aes - Remove VLA usage of skcipher	2018-09-28 12:46:09 +08:00
omap-crypto.c	…
omap-crypto.h	…
omap-des.c	crypto: remove useless initializations of cra_list	2018-11-20 14:26:55 +08:00
omap-sham.c	…
padlock-aes.c	…
padlock-sha.c	…
picoxcell_crypto.c	crypto: skcipher - remove remnants of internal IV generators	2018-12-23 11:52:45 +08:00
picoxcell_crypto_regs.h	…
qcom-rng.c	…
s5p-sss.c	crypto: s5p-sss: Add aes-ctr support	2018-09-28 12:46:06 +08:00
sahara.c	crypto: remove useless initializations of cra_list	2018-11-20 14:26:55 +08:00
talitos.c	crypto: talitos - fix ablkcipher for CONFIG_VMAP_STACK	2019-01-10 21:37:32 +08:00
talitos.h	…