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
..
chtls	crypto: chelsio/chtls: properly set tp->lsndtime	2020-05-26 23:24:00 -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
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