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-12-09 00:13:38 +01:00
2020-10-23 10:06:38 -07:00
2020-10-23 10:06:38 -07:00
2020-10-23 10:06:38 -07:00
2020-12-10 16:36:30 -08:00
2020-12-02 18:17:50 +01:00
2020-12-06 11:22:39 -08:00