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
..
asm	tools: Add missing stdio.h include to asm/bug.h header	2019-09-25 09:51:44 -03:00
asm-generic	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 36	2019-05-24 17:27:11 +02:00
linux	perf tools: Remove broken __no_tail_call attribute	2020-11-03 08:32:15 -03:00
nolibc	tool headers nolibc: add RISCV support	2019-05-08 15:48:43 +02:00
tools	tools: bpf: fix license for a compat header file	2018-09-19 23:49:58 +02:00
trace/events
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
vdso	tools headers: Synchronize linux/bits.h with the kernel sources	2020-04-14 11:40:05 -03:00