Hello:
This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@xxxxxxxxxx>:
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
