David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next' because we no longer have a per-netns conntrack hash. The ip_gre.c conflict as well as the iwlwifi ones were cases of overlapping changes. Conflicts: drivers/net/wireless/intel/iwlwifi/mvm/tx.c net/ipv4/ip_gre.c net/netfilter/nf_conntrack_core.c Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-15 13:32:48 -04:00
..
actions.c	openvswitch: use flow protocol when recalculating ipv6 checksums	2016-04-21 15:28:47 -04:00
conntrack.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-15 13:32:48 -04:00
conntrack.h	openvswitch: Interface with NAT.	2016-03-14 23:47:29 +01:00
datapath.c	ovs: align nlattr properly when needed	2016-04-26 12:00:48 -04:00
datapath.h	ovs: propagate per dp max headroom to all vports	2016-03-01 15:54:30 -05:00
dp_notify.c	openvswitch: fix hangup on vxlan/gre/geneve device deletion	2015-12-03 14:29:25 -05:00
flow.c	openvswitch: add tunnel protocol to sw_flow_key	2015-10-07 04:17:59 -07:00
flow.h	ip_tunnels, bpf: define IP_TUNNEL_OPTS_MAX and use it	2016-03-18 19:38:46 -04:00
flow_netlink.c	libnl: nla_put_be64(): align on a 64-bit area	2016-04-23 20:13:24 -04: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
Kconfig	openvswitch: call only into reachable nf-nat code	2016-03-28 17:58:59 +02:00
Makefile	openvswitch: Remove conntrack Kconfig option.	2015-09-06 23:48:33 -07:00
vport-geneve.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2016-03-17 21:38:27 -07:00
vport-gre.c	openvswitch: properly refcount vport-vxlan module	2015-12-02 11:50:59 -05:00
vport-internal_dev.c	openvswitch: Convert to using IFF_NO_QUEUE	2016-04-16 22:02:14 -04: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