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
..
ftgmac100.c	Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-19 19:08:46 -08:00
ftgmac100.h	net: ftgmac100: Fix Aspeed ast2600 TX hang issue	2020-10-16 15:36:34 -07:00
ftmac100.c	net/faraday: Fix unnecessary check in ftmac100_probe()	2020-04-30 12:20:54 -07:00
ftmac100.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 61	2019-05-24 17:36:45 +02:00
Kconfig	ethernet: select CONFIG_CRC32 as needed	2020-12-04 14:42:21 -08:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00