From: patchwork-bot+netdevbpf@kernel.org
To: Quentin Monnet <quentin@isovalent.com>
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org, bpf@vger.kernel.org,
broonie@kernel.org, hca@linux.ibm.com, sfr@canb.auug.org.au,
liam.howlett@oracle.com, acme@redhat.com, svens@linux.ibm.com,
tmricht@linux.ibm.com
Subject: Re: [PATCH bpf-next] bpftool: Replace "__fallthrough" by a comment to address merge conflict
Date: Thu, 20 Apr 2023 23:40:19 +0000 [thread overview]
Message-ID: <168203401985.29653.2966948536924910337.git-patchwork-notify@kernel.org> (raw)
In-Reply-To: <20230420003333.90901-1-quentin@isovalent.com>
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
prev parent reply other threads:[~2023-04-20 23:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=168203401985.29653.2966948536924910337.git-patchwork-notify@kernel.org \
--to=patchwork-bot+netdevbpf@kernel.org \
--cc=acme@redhat.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=broonie@kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=hca@linux.ibm.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=liam.howlett@oracle.com \
--cc=martin.lau@linux.dev \
--cc=quentin@isovalent.com \
--cc=sdf@google.com \
--cc=sfr@canb.auug.org.au \
--cc=song@kernel.org \
--cc=svens@linux.ibm.com \
--cc=tmricht@linux.ibm.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox