Jakub Kicinski 9d49aea13f Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Small conflict around locking in rxrpc_process_event() - channel_lock moved to bundle in next, while state lock needs _bh() from net. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-10-08 15:44:50 -07:00
..
actions.c	net/sched: act_vlan: Add {POP,PUSH}_ETH actions	2020-10-03 17:28:45 -07:00
conntrack.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-10-08 15:44:50 -07:00
conntrack.h
datapath.c	genetlink: move to smaller ops wherever possible	2020-10-02 19:11:11 -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
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
meter.c	net: openvswitch: Constify static struct genl_small_ops	2020-10-04 21:13:36 -07:00
meter.h	net: openvswitch: use u64 for meter bucket	2020-04-23 18:26:11 -07:00
vport-geneve.c
vport-gre.c
vport-internal_dev.c	net: openvswitch: use dev_sw_netstats_rx_add()	2020-10-06 06:23:21 -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	net: openvswitch: improve the coding style	2020-09-01 11:42:15 -07:00
vport.h