Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h 9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp") 9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins") 099fdeda65 ("bnxt_en: Event handler for PPS events") kernel/bpf/helpers.c include/linux/bpf-cgroup.h a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()") c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current") drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c 5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray") 2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer") MAINTAINERS 7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo") 7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-08-13 06:41:22 -07:00
..
actions.c	openvswitch: fix alignment issues	2021-07-27 11:48:42 +01:00
conntrack.c	net: openvswitch: Remove unnecessary skb_nfct()	2021-05-10 14:18:19 -07:00
conntrack.h	net/sched: act_api: fix miss set post_ct for ovs after do conntrack in act_ct	2021-03-16 15:22:18 -07:00
datapath.c	openvswitch: fix sparse warning incorrect type	2021-07-27 11:48:43 +01:00
datapath.h	openvswitch: Introduce per-cpu upcall dispatch	2021-07-16 11:06:33 -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: add log message for error case	2021-01-14 16:32:14 -08:00
flow_netlink.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 269	2019-06-05 17:30:29 +02:00
flow_table.c	openvswitch: Optimize operation for key comparison	2021-07-01 11:13:10 -07:00
flow_table.h	net: openvswitch: fix to make sure flow_lookup() is not preempted	2020-10-18 12:29:36 -07:00
flow.c	net: openvswitch: fix kernel-doc warnings in flow.c	2021-08-09 15:37:35 -07: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 trace points	2021-06-22 10:47:32 -07:00
meter.c	openvswitch: meter: fix race when getting now_ms.	2021-05-13 15:54:59 -07:00
meter.h	net: openvswitch: use u64 for meter bucket	2020-04-23 18:26:11 -07:00
openvswitch_trace.c	openvswitch: add trace points	2021-06-22 10:47:32 -07:00
openvswitch_trace.h	openvswitch: add trace points	2021-06-22 10:47:32 -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: use core API to update/provide stats	2020-11-14 16:59:32 -08: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 'skb_push_rcsum()' instead of hand coding it	2021-04-04 01:43:02 -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	openvswitch: Warn over-mtu packets only if iface is UP.	2021-03-16 16:28:30 -07:00
vport.h	openvswitch: Fix a typo	2021-03-22 12:59:46 -07:00