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
..
ocelot_ana.h	net: mscc: ocelot: fix fields offset in SG_CONFIG_REG_3	2020-09-24 20:00:40 -07:00
ocelot_dev.h	net: mscc: ocelot: convert port registers to regmap	2020-07-13 17:40:01 -07:00
ocelot_hsio.h	net: mscc: ocelot: simplify register access for PLL5 configuration	2018-10-05 14:36:44 -07:00
ocelot_ptp.h	net: mscc: ocelot: make ocelot_init_timestamp take a const struct ptp_clock_info	2020-09-18 17:52:40 -07:00
ocelot_qsys.h	net: mscc: ocelot: convert QSYS_SWITCH_PORT_MODE and SYS_PORT_MODE to regfields	2020-07-13 17:40:01 -07:00
ocelot_sys.h	net: mscc: ocelot: convert SYS_PAUSE_CFG register access to regfield	2020-07-13 17:40:02 -07:00
ocelot_vcap.h	net: mscc: ocelot: automatically detect VCAP constants	2020-09-29 18:26:24 -07:00
ocelot.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00