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

…

br_if.c

bridge: Export VLAN filtering state

2017-05-26 15:18:44 -04:00

br_input.c

…

br_ioctl.c

…

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

…

br_netfilter_ipv6.c

…

br_netlink_tunnel.c

…

br_netlink.c

net: bridge: Add support for offloading port attributes

2017-06-08 14:16:24 -04:00

br_nf_core.c

…

br_private_stp.h

…

br_private_tunnel.h

…

br_private.h

net: bridge: Receive notification about successful FDB offload

2017-06-08 14:16:25 -04:00

br_stp_bpdu.c

…

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

…

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

…

br_sysfs_if.c

…

br_vlan_tunnel.c

…

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

…

Makefile

…