David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
actions.c	net: use skb_postpush_rcsum instead of own implementations	2016-02-19 23:43:10 -05:00
conntrack.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-31 18:20:10 -05:00
conntrack.h	openvswitch: Fix double-free on ip_defrag() errors	2015-10-27 19:32:14 -07:00
datapath.c	Revert "genl: Add genlmsg_new_unicast() for unicast message allocation"	2016-02-18 11:42:19 -05: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	net: add dst_cache to ovs vxlan lwtunnel	2016-02-16 20:21:48 -05: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	net: add dst_cache to ovs vxlan lwtunnel	2016-02-16 20:21:48 -05:00
Makefile	openvswitch: Remove conntrack Kconfig option.	2015-09-06 23:48:33 -07:00
vport-geneve.c	openvswitch: fix struct geneve_port member name	2016-01-10 23:49:21 -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	net: use skb_postpush_rcsum instead of own implementations	2016-02-19 23:43:10 -05:00
vport-netdev.h	openvswitch: Use dev_queue_xmit for vport send.	2015-10-22 06:46:16 -07:00
vport-vxlan.c	lwt: fix rx checksum setting for lwt devices tunneling over ipv6	2016-02-19 15:39:30 -05:00
vport.c	openvswitch: properly refcount vport-vxlan module	2015-12-02 11:50:59 -05:00
vport.h	net: use skb_postpush_rcsum instead of own implementations	2016-02-19 23:43:10 -05:00