* [PATCH bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict
@ 2023-04-20 0:33 Quentin Monnet
2023-04-20 23:40 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Quentin Monnet @ 2023-04-20 0:33 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko
Cc: Martin KaFai Lau, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, Jiri Olsa, bpf,
Mark Brown, Heiko Carstens, Stephen Rothwell, Liam Howlett,
Arnaldo Carvalho de Melo, Sven Schnelle, Thomas Richter
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(-)
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);
}
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict
2023-04-20 0:33 [PATCH bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict Quentin Monnet
@ 2023-04-20 23:40 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-04-20 23:40 UTC (permalink / raw)
To: Quentin Monnet
Cc: ast, daniel, andrii, martin.lau, song, yhs, john.fastabend,
kpsingh, sdf, haoluo, jolsa, bpf, broonie, hca, sfr,
liam.howlett, acme, svens, tmricht
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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-20 23:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-20 0:33 [PATCH bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict Quentin Monnet
2023-04-20 23:40 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).