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

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

2016-05-09 15:59:24 -04:00

..

netfilter

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

2016-04-23 18:51:33 -04:00

br_device.c

bridge: fix lockdep addr_list_lock false positive splat

2016-01-15 15:40:45 -05:00

br_fdb.c

net: ndo_fdb_dump should report -EMSGSIZE to rtnl_fdb_dump.

2016-02-26 15:04:02 -05:00

br_forward.c

net: remove skb_sender_cpu_clear()

2016-03-01 17:36:47 -05:00

br_if.c

bridge: update max_gso_segs and max_gso_size

2016-03-21 13:35:56 -04:00

br_input.c

bridge: fix potential use-after-free when hook returns QUEUE or STOLEN verdict

2016-03-14 15:46:41 -04:00

br_ioctl.c

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

2016-05-09 15:59:24 -04:00

br_mdb.c

bridge: mdb: Marking port-group as offloaded

2016-04-24 14:23:32 -04:00

br_multicast.c

bridge: fix igmp / mld query parsing

2016-05-06 12:55:13 -04:00

br_netfilter_hooks.c

net: rename IP_INC_STATS_BH()

2016-04-27 22:48:23 -04:00

br_netfilter_ipv6.c

ipv6: rename IP6_INC_STATS_BH()

2016-04-27 22:48:24 -04:00

br_netlink.c

bridge: netlink: export per-vlan stats

2016-05-02 22:27:06 -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: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

br_private.h

bridge: netlink: export per-vlan stats

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

br_stp_bpdu.c

netfilter: Pass net into okfn

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

br_stp_if.c

net: bridge: log port STP state on change

2016-02-18 14:20:08 -05:00

br_stp_timer.c

net: bridge: log port STP state on change

2016-02-18 14:20:08 -05:00

br_stp.c

bridge: Allow set bridge ageing time when switchdev disabled

2016-03-30 15:38:13 -04:00

br_sysfs_br.c

bridge: vlan: learn to count

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

br_sysfs_if.c

bridge: a netlink notification should be sent when those attributes are changed by br_sysfs_if

2016-04-13 22:42:33 -04:00

br_vlan.c

bridge: netlink: export per-vlan stats

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

br.c

switchdev: Require RTNL mutex to be held when sending FDB notifications

2016-01-28 16:21:31 -08:00

Kconfig

bridge: Add vlan filtering infrastructure

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

Makefile

netfilter: bridge: split ipv6 code into separated file

2015-06-18 21:14:21 +02:00