David S. Miller 3ab0a7a0c3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Two minor conflicts: 1) net/ipv4/route.c, adding a new local variable while moving another local variable and removing it's initial assignment. 2) drivers/net/dsa/microchip/ksz9477.c, overlapping changes. One pretty prints the port mode differently, whilst another changes the driver to try and obtain the port mode from the port node rather than the switch node. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-09-22 16:45:34 -07:00
..
netfilter	netfilter: ebt_stp: Remove unused macro BPDU_TYPE_TCN	2020-09-08 12:56:38 +02:00
br_arp_nd_proxy.c	bridge: Avoid infinite loop when suppressing NS messages with invalid options	2020-06-01 11:08:41 -07:00
br_device.c	net: bridge: clear bridge's private skb space on xmit	2020-08-03 15:26:46 -07:00
br_fdb.c	net: bridge: add a flag to avoid refreshing fdb when changing/adding	2020-06-24 14:36:33 -07:00
br_forward.c	net: bridge: check port state before br_allowed_egress	2020-01-24 12:58:14 +01:00
br_if.c	net: bridge: allow enslaving some DSA master network devices	2020-05-10 19:52:33 -07:00
br_input.c	net: bridge: allow enslaving some DSA master network devices	2020-05-10 19:52:33 -07:00
br_ioctl.c	net: bridge: delete duplicated words	2020-09-18 14:12:43 -07:00
br_mdb.c	bridge: mcast: Fix incomplete MDB dump	2020-09-11 14:49:47 -07:00
br_mrp_netlink.c	bridge: mrp: Extend br_mrp_fill_info	2020-07-14 13:46:43 -07: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_mrp.c	bridge: mrp: Implement the MRP Interconnect API	2020-07-14 13:46:43 -07:00
br_multicast.c	net: bridge: mcast: don't ignore return value of __grp_src_toex_excl	2020-09-16 17:13:25 -07:00
br_netfilter_hooks.c	sysctl: pass kernel pointers to ->proc_handler	2020-04-27 02:07:40 -04: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_tunnel.c	net: bridge: notify on vlan tunnel changes done via the old api	2020-07-12 15:18:24 -07:00
br_netlink.c	netlink: consistently use NLA_POLICY_EXACT_LEN()	2020-08-18 12:28:45 -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_mrp.h	bridge: mrp: Implement the MRP Interconnect API	2020-07-14 13:46:43 -07: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_private.h	net: bridge: mcast: destroy all entries via gc	2020-09-07 13:16:36 -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_stp.c	net: bridge: Add checks for enabling the STP.	2020-04-27 11:40:25 -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_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
br_vlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-09-22 16:45:34 -07:00
br.c	bridge: Add SWITCHDEV_FDB_FLUSH_TO_BRIDGE notifier	2020-09-15 13:21:47 -07:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	bridge: mrp: Connect MRP API with the switchdev API	2020-04-27 11:40:25 -07:00