Skip to contentSkip to conversation

bpftool: Replace "__fallthrough" by a comment to address merge conflict

PATCH Applied Quentin Monnet 2 participants 2 messages Apr 20, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 f7a858bffcdd ("tools: Rename __fallthrough to fallthrough")

---
 tools/bpf/bpftool/btf_dumper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/bpf/bpftool/btf_dumper.c +1 -1
index 6c5e0e82da22..294de231db99 100644
@@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
 		case '|':
 		case ' ':
 			putchar('\\');
-			__fallthrough;
+			/* fallthrough */
 		default:
 			putchar(*s);
 		}
Signature · 1 line
2.34.1
#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 8 lines · 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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html