David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Just minor overlapping changes in the conflicts here.

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

2019-08-06 18:44:57 -07:00

..

actions.c

net: core: add MPLS update core helper and use in OvS

2019-07-08 19:50:13 -07:00

conntrack.c

…

conntrack.h

…

datapath.c

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

2019-08-06 18:44:57 -07:00

datapath.h

…

dp_notify.c

net: openvswitch: use netif_ovs_is_port() instead of opencode

2019-07-08 15:53:25 -07:00

flow_netlink.c

…

flow_netlink.h

…

flow_table.c

net: openvswitch: rename flow_stats to sw_flow_stats

2019-07-19 21:27:45 -07:00

flow_table.h

…

flow.c

net: openvswitch: rename flow_stats to sw_flow_stats

2019-07-19 21:27:45 -07:00

flow.h

net: openvswitch: rename flow_stats to sw_flow_stats

2019-07-19 21:27:45 -07:00

Kconfig

…

Makefile

…

meter.c

…

meter.h

…

vport-geneve.c

…

vport-gre.c

…

vport-internal_dev.c

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

2019-06-17 15:55:34 -07:00

vport-internal_dev.h

…

vport-netdev.c

net: openvswitch: use netif_ovs_is_port() instead of opencode

2019-07-08 15:53:25 -07:00

vport-netdev.h

…

vport-vxlan.c

…

vport.c

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

2019-06-17 20:20:36 -07:00

vport.h

…