leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
77788b5bf6becc5ada0da9f99e90c20ea6e77a58
linux/net/bridge
History
David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-15 11:59:32 -04:00
..
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-05-22 23:32:48 -04:00
br_device.c
net: Fix inconsistent teardown and release of private netdev state.
2017-06-07 15:53:24 -04:00
br_fdb.c
net: bridge: Receive notification about successful FDB offload
2017-06-08 14:16:25 -04:00
br_forward.c
bridge: add per-port broadcast flood flag
2017-04-27 16:34:29 -04:00
br_if.c
bridge: Export VLAN filtering state
2017-05-26 15:18:44 -04:00
br_input.c
bridge: drop netfilter fake rtable unconditionally
2017-03-13 13:01:10 -07:00
br_ioctl.c
bridge: move to workqueue gc
2017-02-06 22:53:13 -05:00
br_mdb.c
bridge: Export VLAN filtering state
2017-05-26 15:18:44 -04:00
br_multicast.c
bridge: Export multicast enabled state
2017-05-26 15:18:44 -04:00
br_netfilter_hooks.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-03-23 16:41:27 -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_tunnel.c
netlink: pass extended ACK struct to parsing functions
2017-04-13 13:58:22 -04:00
br_netlink.c
net: bridge: Add support for offloading port attributes
2017-06-08 14:16:24 -04:00
br_nf_core.c
net: Remove protocol from struct dst_ops
2015-03-09 16:06:10 -04: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: vlan dst_metadata hooks in ingress and egress paths
2017-02-03 15:21:22 -05:00
br_private.h
net: bridge: Receive notification about successful FDB offload
2017-06-08 14:16:25 -04:00
br_stp_bpdu.c
netfilter: Pass net into okfn
2015-09-17 17:18:37 -07:00
br_stp_if.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-06-06 22:20:08 -04:00
br_stp_timer.c
bridge: start hello_timer when enabling KERNEL_STP in br_stp_start
2017-05-21 13:33:28 -04:00
br_stp.c
bridge: move to workqueue gc
2017-02-06 22:53:13 -05:00
br_switchdev.c
net: bridge: Add support for notifying devices about FDB add/del
2017-06-08 14:16:25 -04:00
br_sysfs_br.c
sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
2017-03-02 08:42:32 +01:00
br_sysfs_if.c
bridge: add per-port broadcast flood flag
2017-04-27 16:34:29 -04:00
br_vlan_tunnel.c
bridge: vlan_tunnel: explicitly reset metadata attrs to NULL on failure
2017-02-17 13:33:41 -05:00
br_vlan.c
bridge: Export VLAN filtering state
2017-05-26 15:18:44 -04:00
br.c
net: bridge: Receive notification about successful FDB offload
2017-06-08 14:16:25 -04:00
Kconfig
bridge: Add vlan filtering infrastructure
2013-02-13 19:41:46 -05:00
Makefile
bridge: per vlan dst_metadata netlink support
2017-02-03 15:21:22 -05:00