| Message ID | 20230420003333.90901-1-quentin@isovalent.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4b7ef71ac977899cf7bdb09d66052926c7d249ff |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict | expand |
Hello: This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <andrii@kernel.org>: On Thu, 20 Apr 2023 01:33:33 +0100 you wrote: > 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. > > [...] Here is the summary with links: - [bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict https://git.kernel.org/bpf/bpf-next/c/4b7ef71ac977 You are awesome, thank you!
diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c index 6c5e0e82da22..294de231db99 100644 --- a/tools/bpf/bpftool/btf_dumper.c +++ b/tools/bpf/bpftool/btf_dumper.c @@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s) case '|': case ' ': putchar('\\'); - __fallthrough; + /* fallthrough */ default: putchar(*s); }
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 f7a858bffcdd ("tools: Rename __fallthrough to fallthrough") Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program") Reported-by: Sven Schnelle <svens@linux.ibm.com> Link: https://lore.kernel.org/all/yt9dttxlwal7.fsf@linux.ibm.com/ Reported-by: Thomas Richter <tmricht@linux.ibm.com> Link: https://lore.kernel.org/bpf/20230412123636.2358949-1-tmricht@linux.ibm.com/ Suggested-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Quentin Monnet <quentin@isovalent.com> --- tools/bpf/bpftool/btf_dumper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)