Jakub Kicinski 0fe2f273ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/can/dev.c commit 03f16c5075 ("can: dev: can_restart: fix use after free bug") commit 3e77f70e73 ("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit 8e4052c32d ("net: dsa: b53: fix an off by one in checking "vlan->vid"") commit b7a9e0da2d ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-01-20 12:16:11 -08:00
..
api	libperf: Avoid counting of nonfilterable fdarray fds	2020-07-21 09:53:22 -03:00
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-01-20 12:16:11 -08:00
lockdep	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
perf	libperf tests: Fail when failing to get a tracepoint id	2021-01-15 17:28:27 -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
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	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