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
..
hns3pf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
hns3vf	net: hns3: refine the struct hane3_tc_info	2020-12-09 20:33:19 -08:00
Makefile	net: hns3: add trace event support for HNS3 driver	2020-01-06 13:26:25 -08:00
hclge_mbx.h	net: hns3: add priv flags support to switch limit promisc mode	2020-12-08 11:58:52 -08:00
hnae3.c	net: hns3: add or modify some comments	2019-10-31 12:03:23 -07:00
hnae3.h	net: hns3: add support for hw tc offload of tc flower	2020-12-09 20:33:19 -08:00
hns3_dcbnl.c	net: hns3: fix some coding style issues	2019-06-09 13:20:59 -07:00
hns3_debugfs.c	net: hns3: refine the struct hane3_tc_info	2020-12-09 20:33:19 -08:00
hns3_enet.c	net: hns3: add support for hw tc offload of tc flower	2020-12-09 20:33:19 -08:00
hns3_enet.h	net: hns3: add udp tunnel checksum segmentation support	2020-12-01 15:16:31 -08:00
hns3_ethtool.c	net: hns3: add priv flags support to switch limit promisc mode	2020-12-08 11:58:52 -08:00
hns3_trace.h	net: hns3: rename trace event hns3_over_8bd	2020-09-29 13:14:24 -07:00