David S. Miller 2f184393e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Several cases of overlapping changes which were for the most
part trivially resolvable.

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

2019-10-20 10:43:00 -07:00

..

actions.c

net/sched: fix corrupted L2 header with MPLS 'push' and 'pop' actions

2019-10-15 17:14:48 -07:00

conntrack.c

openvswitch: Allow attaching helper in later commit

2019-10-06 15:23:43 +02:00

conntrack.h

…

datapath.c

openvswitch: change type of UPCALL_PID attribute to NLA_UNSPEC

2019-09-26 09:32:33 +02:00

datapath.h

net: openvswitch: Set OvS recirc_id from tc chain index

2019-09-06 14:59:18 +02:00

dp_notify.c

…

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: Set OvS recirc_id from tc chain index

2019-09-06 14:59:18 +02:00

flow.h

openvswitch: Properly set L4 keys on "later" IP fragments

2019-08-28 14:53:51 -07:00

Kconfig

…

Makefile

…

meter.c

…

meter.h

…

vport-geneve.c

…

vport-gre.c

…

vport-internal_dev.c

netfilter: drop bridge nf reset from nf_reset

2019-10-01 18:42:15 +02:00

vport-internal_dev.h

…

vport-netdev.c

…

vport-netdev.h

…

vport-vxlan.c

…

vport.c

…

vport.h

…