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
..
2020-09-04 12:46:07 +01:00
2020-10-18 09:27:10 -07:00
2020-06-08 11:05:55 -07:00
2020-10-16 11:11:15 -07:00
2020-10-16 11:11:19 -07:00
2020-11-14 11:26:03 -08:00
2020-10-16 11:11:19 -07:00
2020-10-16 11:11:17 -07:00