Pablo Neira Ayuso f0a0a978b6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... This merge resolves conflicts with 75aec9df3a ("bridge: Remove br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve netns support in the network stack that reached upstream via David's net-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Conflicts: net/bridge/br_netfilter_hooks.c		2015-10-17 14:28:03 +02:00
..
netfilter	netfilter: remove hook owner refcounting	2015-10-16 18:21:39 +02:00
br.c	switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/	2015-05-12 18:43:52 -04:00
br_device.c	bridge: vlan: use proper rcu for the vlgrp member	2015-10-13 04:57:52 -07:00
br_fdb.c	bridge: defer switchdev fdb del call in fdb_del_external_learn	2015-10-15 06:09:50 -07:00
br_forward.c	bridge: vlan: use proper rcu for the vlgrp member	2015-10-13 04:57:52 -07:00
br_if.c	bridge: defer switchdev fdb del call in fdb_del_external_learn	2015-10-15 06:09:50 -07:00
br_input.c	bridge: vlan: use proper rcu for the vlgrp member	2015-10-13 04:57:52 -07:00
br_ioctl.c	bridge: push bridge setting ageing_time down to switchdev	2015-10-12 05:20:20 -07:00
br_mdb.c	bridge: vlan: add per-vlan struct and move to rhashtables	2015-09-29 13:36:06 -07:00
br_multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
br_netfilter_hooks.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02: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: vlan: use rcu for vlan_list traversal in br_fill_ifinfo	2015-10-13 04:57:54 -07:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
br_private.h	bridge: vlan: move back vlan_flush	2015-10-13 04:57:58 -07: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	switchdev: allow caller to explicitly request attr_set as deferred	2015-10-15 06:09:48 -07:00
br_stp_bpdu.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
br_stp_if.c	bridge: stp: when using userspace stp stop kernel hello and hold timers	2015-07-28 23:33:20 -07:00
br_stp_timer.c	bridge: stp: when using userspace stp stop kernel hello and hold timers	2015-07-28 23:33:20 -07:00
br_sysfs_br.c	bridge: fix gc_timer mod/del race condition	2015-10-13 04:50:17 -07:00
br_sysfs_if.c	bridge: vlan: flush the dynamically learned entries on port vlan delete	2015-06-24 05:40:55 -07:00
br_vlan.c	bridge: vlan: move back vlan_flush	2015-10-13 04:57:58 -07: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