Jakub Kicinski 46d5e62dd3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_return_frame_bulk() needs to pass a xdp_buff to __xdp_return(). strlcpy got converted to strscpy but here it makes no functional difference, so just keep the right code. Conflicts: net/netfilter/nf_tables_api.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-12-11 22:29:38 -08:00
..
ch_ipsec	cxgb4/ch_ipsec: Replace the module name to ch_ipsec from chcr	2020-10-15 09:28:34 -07:00
ch_ktls	ch_ktls: fix build warning for ipv4-only config	2020-12-05 12:56:21 -08:00
chtls	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-03 15:44:09 -08:00
Kconfig	net: chelsio: inline_crypto: fix Kconfig and build errors	2020-10-20 18:15:53 -07:00
Makefile	crypto/chcr: move nic TLS functionality to drivers/net	2020-09-11 17:26:39 -07:00