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
..
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
sw	RMDA/sw: Don't allow drivers using dma_virt_ops on highmem configs	2020-11-12 13:27:41 -04:00
ulp	RDMA 5.10 second rc pull request	2020-11-05 11:25:02 -08:00
Kconfig	RMDA/sw: Don't allow drivers using dma_virt_ops on highmem configs	2020-11-12 13:27:41 -04:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00