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	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
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	net: openvswitch: use netif_ovs_is_port() instead of opencode	2019-07-08 15:53:25 -07:00
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
flow_netlink.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
flow_netlink.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
flow_table.c	net: openvswitch: rename flow_stats to sw_flow_stats	2019-07-19 21:27:45 -07:00
flow_table.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00
Makefile	openvswitch: Add meter infrastructure	2017-11-13 10:37:07 +09:00
meter.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
meter.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 206	2019-05-30 11:29:53 -07:00
vport-geneve.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
vport-gre.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
vport-internal_dev.c	netfilter: drop bridge nf reset from nf_reset	2019-10-01 18:42:15 +02:00
vport-internal_dev.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
vport-netdev.c	net: openvswitch: use netif_ovs_is_port() instead of opencode	2019-07-08 15:53:25 -07:00
vport-netdev.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
vport-vxlan.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
vport.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
vport.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00