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
..
api	tools api fs: Cache cgroupfs mount point	2021-02-17 15:09:08 -03:00
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-13 06:41:22 -07:00
lockdep	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
perf	libperf: Add tests for perf_evlist__set_leader()	2021-07-09 15:34:41 -03:00
subcmd	tools: Avoid comma separated statements	2020-10-02 10:36:36 -06:00
symbol	libsymbols kallsyms: Move hex2u64 out of header	2020-05-05 16:35:32 -03:00
traceevent	KVM: x86/mmu: Rename "nxe" role bit to "efer_nx" for macro shenanigans	2021-06-24 18:00:41 -04:00
argv_split.c
bitmap.c	tools lib: Adopt bitmap_intersects() operation from the kernel sources	2021-06-30 15:28:00 -03:00
ctype.c
find_bit.c	tools: sync lib/find_bit implementation	2021-05-06 19:24:12 -07:00
hweight.c
rbtree.c	tools/: replace HTTP links with HTTPS ones	2020-08-07 11:33:21 -07:00
str_error_r.c
string.c	tools lib: Adopt memchr_inv() from kernel	2020-11-27 08:34:52 -03:00
vsprintf.c
zalloc.c