Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: MAINTAINERS - keep Chandrasekar drivers/net/ethernet/mellanox/mlx5/core/en_main.c - simple fix + trust the code re-added to param.c in -next is fine include/linux/bpf.h - trivial include/linux/ethtool.h - trivial, fix kdoc while at it include/linux/skmsg.h - move to relevant place in tcp.c, comment re-wrapped net/core/skmsg.c - add the sk = sk // sk = NULL around calls net/tipc/crypto.c - trivial Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-04-09 20:48:35 -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-04-09 20:48:35 -07:00
lockdep	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
perf	libperf: Add perf_evlist__reset_id_hash()	2021-03-06 16:54:31 -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	tools lib traceevent: Hide non API functions	2020-10-13 11:47:38 -03:00
argv_split.c	tools lib: Move argv_{split,free} from tools/perf/util/	2019-07-01 22:50:40 -03:00
bitmap.c	tools bitmap: Implement bitmap_equal() operation at bitmap API	2020-01-06 11:46:04 -03:00
ctype.c	tools perf: Move from sane_ctype.h obtained from git to the Linux's original	2019-06-25 21:02:47 -03:00
find_bit.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 152	2019-05-30 11:26:32 -07:00
hweight.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
rbtree.c	tools/: replace HTTP links with HTTPS ones	2020-08-07 11:33:21 -07:00
str_error_r.c	objtool, perf: Fix GCC 8 -Wrestrict error	2018-03-19 13:51:54 -03:00
string.c	tools lib: Adopt memchr_inv() from kernel	2020-11-27 08:34:52 -03:00
vsprintf.c	perf script: Pad DSO name for --call-trace	2019-05-28 18:37:44 -03:00
zalloc.c	tools lib: Adopt zalloc()/zfree() from tools/perf	2019-07-09 10:13:26 -03:00