Jakub Kicinski 44a8c4f33c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... We got slightly different patches removing a double word in a comment in net/ipv4/raw.c - picked the version from net. Simple conflict in drivers/net/ethernet/ibm/ibmvnic.c. Use cached values instead of VNIC login response buffer (following what commit 507ebe6444 ("ibmvnic: Fix use-after-free of VNIC login response buffer") did). Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-09-04 21:28:59 -07:00
..
actions.c	net: openvswitch: improve the coding style	2020-09-01 11:42:15 -07:00
conntrack.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
conntrack.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 295	2019-06-05 17:36:38 +02:00
datapath.c	net: openvswitch: fixes crash if nf_conncount_init() fails	2020-09-01 13:23:23 -07:00
datapath.h	net: openvswitch: add masks cache hit counter	2020-08-03 15:17:48 -07: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	net: openvswitch: kerneldoc fixes	2020-07-13 17:20:40 -07: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: remove unused keep_flows	2020-09-01 11:42:15 -07:00
flow_table.h	net: openvswitch: remove unused keep_flows	2020-09-01 11:42:15 -07:00
flow.c	treewide: Use fallthrough pseudo-keyword	2020-08-23 17:36:59 -05:00
flow.h	treewide: Use sizeof_field() macro	2019-12-09 10:36:44 -08:00
Kconfig	treewide: replace '---help---' in Kconfig files with 'help'	2020-06-14 01:57:21 +09:00
Makefile	openvswitch: Add meter infrastructure	2017-11-13 10:37:07 +09:00
meter.c	net: openvswitch: use div_u64() for 64-by-32 divisions	2020-04-25 20:48:21 -07:00
meter.h	net: openvswitch: use u64 for meter bucket	2020-04-23 18:26:11 -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	net: openvswitch: free vport unless register_netdevice() succeeds	2019-10-22 14:45:08 -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	net: openvswitch: improve the coding style	2020-09-01 11:42:15 -07:00
vport.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00