David S. Miller 6f41617bf2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net' overlapped the renaming of a netlink attribute in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-03 21:00:17 -07:00
..
netfilter	netfilter: bridge: Expose nf_tables bridge hook priorities through uapi	2018-08-03 21:15:09 +02:00
Kconfig	bridge: Add vlan filtering infrastructure	2013-02-13 19:41:46 -05:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
br.c	net: bridge: add bitfield for options and convert vlan opts	2018-09-26 10:04:22 -07:00
br_arp_nd_proxy.c	net: bridge: convert neigh_suppress_enabled option to a bit	2018-09-26 10:04:23 -07:00
br_device.c	net: bridge: convert mtu_set_by_user to a bit	2018-09-26 10:04:23 -07:00
br_fdb.c	net: bridge: explicitly zero is_sticky in fdb_create	2018-09-28 10:43:11 -07:00
br_forward.c	net: bridge: add support for backup port	2018-07-23 09:32:15 -07:00
br_if.c	net: bridge: convert mtu_set_by_user to a bit	2018-09-26 10:04:23 -07:00
br_input.c	net: bridge: convert neigh_suppress_enabled option to a bit	2018-09-26 10:04:23 -07:00
br_ioctl.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_mdb.c	net: bridge: convert and rename mcast disabled	2018-09-26 10:04:23 -07:00
br_multicast.c	bridge: mcast: Default back to multicast enabled state	2018-10-02 22:27:36 -07:00
br_netfilter_hooks.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-03 21:00:17 -07:00
br_netfilter_ipv6.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
br_netlink.c	net: bridge: convert mcast options to bits	2018-09-26 10:04:23 -07:00
br_netlink_tunnel.c	bridge: netlink: make setlink/dellink notifications more accurate	2017-10-29 11:03:43 +09:00
br_nf_core.c	xfrm: Move dst->path into struct xfrm_dst	2017-11-30 09:54:26 -05:00
br_private.h	net: bridge: pack net_bridge better	2018-09-26 10:04:23 -07:00
br_private_stp.h	net: bridge: add helper to set topology change	2016-12-10 21:27:23 -05:00
br_private_tunnel.h	bridge: netlink: make setlink/dellink notifications more accurate	2017-10-29 11:03:43 +09:00
br_stp.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_stp_bpdu.c	net: introduce __skb_put_[zero, data, u8]	2017-06-20 13:30:14 -04:00
br_stp_if.c	net: bridge: add notifications for the bridge dev on vlan change	2017-11-02 15:53:40 +09:00
br_stp_timer.c	net: bridge: Convert timers to use timer_setup()	2017-11-03 15:42:49 +09:00
br_switchdev.c	net: bridge: Extract boilerplate around switchdev_port_obj_*()	2018-05-31 14:13:42 -04:00
br_sysfs_br.c	net: bridge: convert mcast options to bits	2018-09-26 10:04:23 -07:00
br_sysfs_if.c	net: bridge: add support for backup port	2018-07-23 09:32:15 -07:00
br_vlan.c	net: bridge: convert group_addr_set option to a bit	2018-09-26 10:04:23 -07:00
br_vlan_tunnel.c	bridge: vlan_tunnel: explicitly reset metadata attrs to NULL on failure	2017-02-17 13:33:41 -05:00