David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-01-28 10:33:06 -05:00

..

netfilter

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

br_device.c

net: make ndo_get_stats64 a void function

2017-01-08 17:51:44 -05:00

br_fdb.c

bridge: add address and vlan to fdb warning messages

2016-10-13 10:49:54 -04:00

br_forward.c

bridge: move maybe_deliver_addr() inside #ifdef

2017-01-25 23:16:06 -05:00

br_if.c

net: bridge: add per-port multicast flood flag

2016-09-01 22:48:33 -07:00

br_input.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-09-12 15:52:44 -07:00

br_ioctl.c

Replace <asm/uaccess.h> with <linux/uaccess.h> globally

2016-12-24 11:46:01 -08:00

br_mdb.c

bridge: multicast to unicast

2017-01-24 12:39:52 -05:00

br_multicast.c

bridge: multicast to unicast

2017-01-24 12:39:52 -05:00

br_netfilter_hooks.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

2017-01-05 11:49:57 -05: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-01-28 10:33:06 -05: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.h

bridge: multicast to unicast

2017-01-24 12:39:52 -05:00

br_stp_bpdu.c

netfilter: Pass net into okfn

2015-09-17 17:18:37 -07:00

br_stp_if.c

net: bridge: add helper to set topology change

2016-12-10 21:27:23 -05:00

br_stp_timer.c

net: bridge: add helper to set topology change

2016-12-10 21:27:23 -05:00

br_stp.c

net: bridge: shorten ageing time on topology change

2016-12-10 21:28:28 -05:00

br_switchdev.c

bridge: switchdev: Add forward mark support for stacked devices

2016-08-26 13:13:36 -07:00

br_sysfs_br.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-12-06 21:33:19 -05:00

br_sysfs_if.c

bridge: multicast to unicast

2017-01-24 12:39:52 -05:00

br_vlan.c

bridge: netlink: export per-vlan stats

2016-05-02 22:27:06 -04:00

br.c

netfilter: bridge: clarify bridge/netfilter message

2016-10-02 22:44:03 -04:00

Kconfig

bridge: Add vlan filtering infrastructure

2013-02-13 19:41:46 -05:00

Makefile

bridge: switchdev: Add forward mark support for stacked devices

2016-08-26 13:13:36 -07:00