Pablo Neira Ayuso f20fbc0717 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Conflicts: net/netfilter/core.c net/netfilter/nf_tables_netdev.c Resolve two conflicts before pull request for David's net-next tree: 1) Between c73c248490 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment") from the net tree and commit ddc8b6027a ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()"). 2) Between e8bffe0cf9 ("net: Add _nf_(un)register_hooks symbols") and Aaron Conole's patches to replace list_head with single linked list. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2016-09-25 23:34:19 +02:00
..
netfilter	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-09-25 23:34:19 +02: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
br.c	switchdev: Require RTNL mutex to be held when sending FDB notifications	2016-01-28 16:21:31 -08:00
br_device.c	net: bridge: change unicast boolean to exact pkt_type	2016-09-01 22:48:33 -07:00
br_fdb.c	rtnetlink: fdb dump: optimize by saving last interface markers	2016-09-01 16:56:15 -07:00
br_forward.c	net: bridge: add per-port multicast flood flag	2016-09-01 22:48:33 -07: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	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: re-introduce 'fix parsing of MLDv2 reports'	2016-08-31 09:29:58 -07:00
br_netfilter_hooks.c	netfilter: replace list_head with single linked list	2016-09-25 14:38:48 +02:00
br_netfilter_ipv6.c	netfilter: bridge: add and use br_nf_hook_thresh	2016-09-24 21:25:48 +02:00
br_netlink.c	net: bridge: add per-port multicast flood flag	2016-09-01 22:48:33 -07:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
br_private.h	net: bridge: change unicast boolean to exact pkt_type	2016-09-01 22:48:33 -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	net: bridge: br_set_ageing_time takes a clock_t	2016-07-25 10:30:03 -07: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 call /sbin/bridge-stp	2016-09-13 11:21:31 -04:00
br_stp_timer.c	net: bridge: log port STP state on change	2016-02-18 14:20:08 -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	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04:00
br_sysfs_if.c	net: bridge: add per-port multicast flood flag	2016-09-01 22:48:33 -07:00
br_vlan.c	bridge: netlink: export per-vlan stats	2016-05-02 22:27:06 -04:00