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-05-22 22:02:34 -07:00
2020-05-22 22:02:34 -07:00
2020-07-29 08:38:54 -07:00
2020-07-29 08:38:54 -07:00
2020-05-27 17:03:40 -07:00
2019-11-08 12:02:14 -08:00
2020-07-29 08:38:54 -07:00
2020-08-01 08:44:04 -07:00
2020-05-22 21:44:48 -07:00
2020-10-09 13:14:19 -07:00
2020-05-21 22:10:04 -07:00
2020-05-21 22:10:04 -07:00
2020-08-01 08:44:04 -07:00
2020-08-01 08:44:04 -07:00
2020-12-09 08:11:55 -08:00
2020-08-01 08:44:04 -07:00
2020-10-09 13:14:19 -07:00
2020-12-09 08:11:54 -08:00