David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ...

The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

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

2018-08-02 10:55:32 -07:00

..

actions.c

openvswitch: kernel datapath clone action

2018-07-08 11:13:25 +09:00

conntrack.c

ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module

2018-07-18 11:26:53 +02:00

conntrack.h

openvswitch: Support conntrack zone limit

2018-05-25 16:45:19 -04:00

datapath.c

treewide: kmalloc() -> kmalloc_array()

2018-06-12 16:19:22 -07:00

datapath.h

openvswitch: Support conntrack zone limit

2018-05-25 16:45:19 -04:00

dp_notify.c

openvswitch: reliable interface indentification in port dumps

2017-11-05 21:49:17 +09:00

flow_netlink.c

openvswitch: kernel datapath clone action

2018-07-08 11:13:25 +09:00

flow_netlink.h

openvswitch: enable NSH support

2017-11-08 16:12:33 +09:00

flow_table.c

openvswitch: Optimize operations for OvS flow_stats.

2017-07-19 13:49:39 -07:00

flow_table.h

openvswitch: Zero flows on allocation.

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

flow.c

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

2017-12-22 11:16:31 -05:00

flow.h

openvswitch: enable NSH support

2017-11-08 16:12:33 +09:00

Kconfig

openvswitch: Support conntrack zone limit

2018-05-25 16:45:19 -04:00

Makefile

openvswitch: Add meter infrastructure

2017-11-13 10:37:07 +09:00

meter.c

openvswitch: meter: Fix setting meter id for new entries

2018-07-29 13:20:54 -07:00

meter.h

openvswitch: Add meter infrastructure

2017-11-13 10:37:07 +09:00

vport-geneve.c

openvswitch: do not ignore netdev errors when creating tunnel vports

2016-08-10 23:13:23 -07:00

vport-gre.c

openvswitch: do not ignore netdev errors when creating tunnel vports

2016-08-10 23:13:23 -07:00

vport-internal_dev.c

net: ovs: remove unused hardirq.h

2018-01-08 20:59:25 -05:00

vport-internal_dev.h

…

vport-netdev.c

net: Add extack to upper device linking

2017-10-04 21:39:33 -07:00

vport-netdev.h

openvswitch: Use dev_queue_xmit for vport send.

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

vport-vxlan.c

vxlan: get rid of redundant vxlan_dev.flags

2017-06-20 13:37:02 -04:00

vport.c

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

vport.h

openvswitch: pass mac_proto to ovs_vport_send

2016-11-13 00:51:02 -05:00