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
..
netfilter	netfilter: nft_reject: unify reject init and dump into nft_reject	2020-10-31 10:40:42 +01:00
Kconfig	bridge: cfm: Add BRIDGE_CFM to Kconfig.	2020-10-29 18:39:43 -07:00
Makefile	bridge: cfm: Netlink SET configuration Interface.	2020-10-29 18:39:43 -07:00
br.c	bridge: Add SWITCHDEV_FDB_FLUSH_TO_BRIDGE notifier	2020-09-15 13:21:47 -07:00
br_arp_nd_proxy.c	net: core: introduce struct netdev_nested_priv for nested interface infrastructure	2020-09-28 15:00:15 -07:00
br_cfm.c	bridge: cfm: Netlink Notifications.	2020-10-29 18:39:44 -07:00
br_cfm_netlink.c	bridge: cfm: Netlink Notifications.	2020-10-29 18:39:44 -07:00
br_device.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
br_fdb.c	net: bridge: fdb: don't flush ext_learn entries	2020-09-28 12:47:43 -07:00
br_forward.c	net: bridge: mcast: when forwarding handle filter mode and blocked flag	2020-09-23 13:24:35 -07:00
br_if.c	bridge: cfm: Kernel space implementation of CFM. MEP create/delete.	2020-10-29 18:39:43 -07:00
br_input.c	net: bridge: switch to net core statistics counters handling	2020-11-21 14:40:50 -08:00
br_ioctl.c	net: bridge: delete duplicated words	2020-09-18 14:12:43 -07:00
br_mdb.c	net: bridge: explicitly convert between mdb entry state and port group flags	2020-10-30 17:58:16 -07:00
br_mrp.c	bridge: mrp: Implement LC mode for MRP	2020-11-25 13:33:35 -08:00
br_mrp_netlink.c	bridge: mrp: Use hlist_head instead of list_head for mrp	2020-11-09 16:42:12 -08:00
br_mrp_switchdev.c	bridge: switchdev: mrp: Extend MRP API for switchdev for MRP Interconnect	2020-07-14 13:46:43 -07:00
br_multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
br_netfilter_hooks.c	netfilter: bridge: reset skb->pkt_type after NF_INET_POST_ROUTING traversal	2020-11-28 11:46:51 -08:00
br_netfilter_ipv6.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-06-25 01:32:59 +02:00
br_netlink.c	net: bridge: replace struct br_vlan_stats with pcpu_sw_netstats	2020-11-18 17:23:16 -08:00
br_netlink_tunnel.c	net: bridge: notify on vlan tunnel changes done via the old api	2020-07-12 15:18:24 -07:00
br_nf_core.c	net: add bool confirm_neigh parameter for dst_ops.update_pmtu	2019-12-24 22:28:54 -08:00
br_private.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
br_private_cfm.h	bridge: cfm: Kernel space implementation of CFM. CCM frame RX added.	2020-10-29 18:39:43 -07:00
br_private_mrp.h	bridge: mrp: Use hlist_head instead of list_head for mrp	2020-11-09 16:42:12 -08:00
br_private_stp.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
br_private_tunnel.h	net: bridge: vlan options: add support for tunnel mapping set/del	2020-03-17 22:47:12 -07:00
br_stp.c	net: bridge: Add checks for enabling the STP.	2020-04-27 11:40:25 -07:00
br_stp_bpdu.c	net: bridge: add STP xstats	2019-12-14 20:02:36 -08:00
br_stp_if.c	net: remove newlines in NL_SET_ERR_MSG_MOD	2020-05-07 17:56:14 -07:00
br_stp_timer.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
br_switchdev.c	net: bridge: fdb: convert offloaded to use bitops	2019-10-29 18:12:49 -07:00
br_sysfs_br.c	net: bridge: Add checks for enabling the STP.	2020-04-27 11:40:25 -07:00
br_sysfs_if.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
br_vlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
br_vlan_options.c	net: bridge: vlan options: move the tunnel command to the nested attribute	2020-03-20 08:52:20 -07:00
br_vlan_tunnel.c	net: bridge: vlan tunnel: constify bridge and port arguments	2020-03-17 22:47:12 -07:00