David S. Miller 68aaf44595 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-27 14:23:31 -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	openvswitch: Fix conntrack cache with timeout	2019-08-25 14:48:43 -07:00
conntrack.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
datapath.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-06 18:44:57 -07:00
datapath.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
dp_notify.c	net: openvswitch: use netif_ovs_is_port() instead of opencode	2019-07-08 15:53:25 -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
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	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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 15:55:34 -07: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