tree 72f00a33d177cae0c8c9d7337ced3a6c6bbad45d
parent 91163f82143630a9629a8bf0227d49173697c69c
parent 7f376f1917d7461e05b648983e8d2aea9d0712b2
author Jakub Kicinski <kuba@kernel.org> 1607746356 -0800
committer Jakub Kicinski <kuba@kernel.org> 1607754578 -0800

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>