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

Conflicts:
	net/bridge/br_mdb.c

Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.

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

2015-07-13 17:28:09 -07:00

..

netfilter

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

2015-06-24 16:49:49 -07:00

br_device.c

netfilter: bridge: use rcu hook to resolve br_netfilter dependency

2015-03-10 15:03:02 +01:00

br_fdb.c

bridge: vlan: flush the dynamically learned entries on port vlan delete

2015-06-24 05:40:55 -07:00

br_forward.c

bridge: fix potential crash in __netdev_pick_tx()

2015-07-09 22:48:42 -07:00

br_if.c

bridge: vlan: flush the dynamically learned entries on port vlan delete

2015-06-24 05:40:55 -07:00

br_input.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

br_ioctl.c

bridge: fix br_stp_set_bridge_priority race conditions

2015-06-18 03:29:47 -07:00

br_mdb.c

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

2015-07-13 17:28:09 -07:00

br_multicast.c

bridge: mdb: fill state in br_mdb_notify

2015-07-09 21:41:11 -07:00

br_netfilter_hooks.c

netfilter: bridge: don't leak skb in error paths

2015-07-02 17:59:26 +02:00

br_netfilter_ipv6.c

netfilter: bridge: Use __in6_dev_get rather than in6_dev_get in br_validate_ipv6

2015-07-08 11:02:16 +02:00

br_netlink.c

bridge: vlan: fix usage of vlan 0 and 4095 again

2015-07-02 12:19:17 -07:00

br_nf_core.c

net: Remove protocol from struct dst_ops

2015-03-09 16:06:10 -04:00

br_private_stp.h

…

br_private.h

bridge: mdb: fill state in br_mdb_notify

2015-07-09 21:41:11 -07:00

br_stp_bpdu.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

br_stp_if.c

bridge: vlan: flush the dynamically learned entries on port vlan delete

2015-06-24 05:40:55 -07:00

br_stp_timer.c

bridge: fix lockdep splat

2015-05-22 16:23:56 -04:00

br_stp.c

bridge: multicast: add a comment to br_port_state_selection about blocking state

2015-06-24 05:40:54 -07:00

br_sysfs_br.c

…

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: flush the dynamically learned entries on port vlan delete

2015-06-24 05:40:55 -07:00

br.c

switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/

2015-05-12 18:43:52 -04:00

Kconfig

…

Makefile

netfilter: bridge: split ipv6 code into separated file

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