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: Fix off-by 1 relative directory includes	2020-03-06 08:36:46 -03:00
asm-generic	tools headers UAPI: Update process_madvise affected files	2020-11-03 08:29:30 -03:00
drm	tools headers UAPI: Sync drm/i915_drm.h with the kernel sources	2020-11-03 08:35:13 -03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
sound	tools include UAPI: Sync sound/asound.h copy	2020-02-12 11:04:23 -03:00