Pablo Neira Ayuso a4ec80082c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Conflicts:
	net/ipv6/netfilter/nf_conntrack_reasm.c

2015-12-14 20:31:16 +01:00

..

actions.c

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

2015-11-01 00:15:30 -04:00

conntrack.c

netfilter: ipv6: avoid nf_iterate recursion

2015-11-23 17:54:45 +01:00

conntrack.h

openvswitch: Fix double-free on ip_defrag() errors

2015-10-27 19:32:14 -07:00

datapath.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2015-11-07 13:05:44 -08:00

datapath.h

openvswitch: Fix egress tunnel info.

2015-10-22 19:39:25 -07:00

dp_notify.c

openvswitch: fix hangup on vxlan/gre/geneve device deletion

2015-12-03 14:29:25 -05:00

flow_netlink.c

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

2015-10-24 06:54:12 -07:00

flow_netlink.h

openvswitch: Fix egress tunnel info.

2015-10-22 19:39:25 -07:00

flow_table.c

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

2015-10-20 06:08:27 -07:00

flow_table.h

openvswitch: Zero flows on allocation.

2015-09-22 17:33:41 -07:00

flow.c

openvswitch: add tunnel protocol to sw_flow_key

2015-10-07 04:17:59 -07:00

flow.h

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

2015-10-20 06:08:27 -07:00

Kconfig

openvswitch: Fix dependency on IPv6 defrag.

2015-09-11 15:39:04 -07:00

Makefile

openvswitch: Remove conntrack Kconfig option.

2015-09-06 23:48:33 -07:00

vport-geneve.c

openvswitch: properly refcount vport-vxlan module

2015-12-02 11:50:59 -05:00

vport-gre.c

openvswitch: properly refcount vport-vxlan module

2015-12-02 11:50:59 -05:00

vport-internal_dev.c

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

2015-10-24 06:54:12 -07:00

vport-internal_dev.h

openvswitch: introduce rtnl ops stub

2014-07-01 14:40:17 -07:00

vport-netdev.c

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

2015-12-03 21:09:12 -05:00

vport-netdev.h

openvswitch: Use dev_queue_xmit for vport send.

2015-10-22 06:46:16 -07:00

vport-vxlan.c

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

2015-10-24 06:54:12 -07:00

vport.c

openvswitch: properly refcount vport-vxlan module

2015-12-02 11:50:59 -05:00

vport.h

openvswitch: properly refcount vport-vxlan module

2015-12-02 11:50:59 -05:00