Quentin Monnet 4b7ef71ac9 bpftool: Replace "__fallthrough" by a comment to address merge conflict ... The recent support for inline annotations in control flow graphs generated by bpftool introduced the usage of the "__fallthrough" macro in a switch/case block in btf_dumper.c. This change went through the bpf-next tree, but resulted in a merge conflict in linux-next, because this macro has been renamed "fallthrough" (no underscores) in the meantime. To address the conflict, we temporarily switch to a simple comment instead of a macro. Related: commit f7a858bffc ("tools: Rename __fallthrough to fallthrough") Fixes: 9fd496848b ("bpftool: Support inline annotations when dumping the CFG of a program") Reported-by: Sven Schnelle <svens@linux.ibm.com> Reported-by: Thomas Richter <tmricht@linux.ibm.com> Suggested-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Quentin Monnet <quentin@isovalent.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/all/yt9dttxlwal7.fsf@linux.ibm.com/ Link: https://lore.kernel.org/bpf/20230412123636.2358949-1-tmricht@linux.ibm.com/ Link: https://lore.kernel.org/bpf/20230420003333.90901-1-quentin@isovalent.com		2023-04-20 16:38:10 -07:00
..
bpftool	bpftool: Replace "__fallthrough" by a comment to address merge conflict	2023-04-20 16:38:10 -07:00
resolve_btfids	tools/resolve_btfids: Add /libsubcmd to .gitignore	2023-03-06 16:23:01 +01:00
runqslower	tools: runqslower: Add EXTRA_CFLAGS and EXTRA_LDFLAGS support	2023-02-10 15:21:26 -08:00
.gitignore	.gitignore: add SPDX License Identifier	2020-03-25 11:50:48 +01:00
bpf_asm.c	docs: networking: convert filter.txt to ReST	2020-04-28 14:39:46 -07:00
bpf_dbg.c	bpf: Simplify the calculation of variables	2021-03-04 19:24:53 -08:00
bpf_exp.l	bpf: fix cbpf parser bug for octal numbers	2018-06-03 07:46:55 -07:00
bpf_exp.y	tools, bpf_asm: Exit non-zero on errors	2021-02-26 22:53:50 +01:00
bpf_jit_disasm.c	tools bpf_jit_disasm: Fix compilation error with new binutils	2022-08-01 15:30:48 -03:00
Makefile	tools bpf_jit_disasm: Don't display disassembler-four-args feature test	2022-08-01 15:31:51 -03:00