David S. Miller c0cc53162a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes in the conflicts. In the macsec case, the change of the default ID macro name overlapped with the 64-bit netlink attribute alignment fixes in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-27 15:43:10 -04:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04: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
br.c	switchdev: Require RTNL mutex to be held when sending FDB notifications	2016-01-28 16:21:31 -08: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	bridge: a netlink notification should be sent when those attributes are changed by ioctl	2016-04-13 22:42:33 -04:00
br_mdb.c	bridge: mdb: Marking port-group as offloaded	2016-04-24 14:23:32 -04:00
br_multicast.c	bridge: mdb: Marking port-group as offloaded	2016-04-24 14:23:32 -04:00
br_netfilter_hooks.c	netfilter: bridge: register hooks only when bridge interface is added	2016-03-02 20:05:25 +01:00
br_netfilter_ipv6.c	bridge: Pass net into br_validate_ipv4 and br_validate_ipv6	2015-09-29 20:21:32 +02:00
br_netlink.c	bridge: use nla_put_u64_64bit()	2016-04-25 15:09:10 -04:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
br_private.h	bridge: mdb: Marking port-group as offloaded	2016-04-24 14:23:32 -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_stp.c	bridge: Allow set bridge ageing time when switchdev disabled	2016-03-30 15:38:13 -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_sysfs_br.c	bridge: a netlink notification should be sent when those attributes are changed by br_sysfs_br	2016-04-13 22:42:33 -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: a netlink notification should be sent when those attributes are changed by br_sysfs_br	2016-04-13 22:42:33 -04:00