David S. Miller 3793faad7b Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts were all overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-06 22:10:13 -07:00
..
chtls	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2020-04-01 14:47:40 -07:00
Kconfig	cxgb4/chcr : Register to tls add and del callback	2020-03-08 21:16:23 -07:00
Makefile	cxgb4/chcr : Register to tls add and del callback	2020-03-08 21:16:23 -07:00
chcr_algo.c	Crypto/chcr: fix for hmac(sha) test fails	2020-05-06 17:44:11 -07:00
chcr_algo.h	crypto: chelsio - switch to skcipher API	2019-11-17 09:02:47 +08:00
chcr_common.h	chcr: Handle first or middle part of record	2020-03-08 21:16:23 -07:00
chcr_core.c	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2020-04-01 14:47:40 -07:00
chcr_core.h	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2020-04-01 14:47:40 -07:00
chcr_crypto.h	Crypto/chcr: fix ctr, cbc, xts and rfc3686-ctr failed tests	2020-05-06 17:44:11 -07:00
chcr_ipsec.c	Revert "crypto: chelsio - Inline single pdu only"	2020-05-06 14:51:59 -07:00
chcr_ktls.c	cxgb4/chcr: avoid -Wreturn-local-addr warning	2020-05-04 11:47:52 -07:00
chcr_ktls.h	cxgb4/chcr: Add ipv6 support and statistics	2020-03-08 21:16:23 -07:00