From: "Alexei Starovoitov" <alexei.starovoitov@gmail.com>
To: "Mark Brown" <broonie@kernel.org>,
"Kumar Kartikeya Dwivedi" <memxor@gmail.com>,
"Eduard Zingerman" <eddyz87@gmail.com>,
"Daniel Borkmann" <daniel@iogearbox.net>,
"Alexei Starovoitov" <ast@kernel.org>,
"Andrii Nakryiko" <andrii@kernel.org>,
"bpf" <bpf@vger.kernel.org>,
"Networking" <netdev@vger.kernel.org>
Cc: "Kees Cook" <kees@kernel.org>,
"Kees Cook" <kees+treewide@kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the origin tree
Date: Sat, 14 Nov 2026 19:36:17 +0000 [thread overview]
Message-ID: <DMV6Q8SFLQ72.2AIN7VRB1JJOW@gmail.com> (raw)
In-Reply-To: <avNO8cuAdnwv9D_5@sirena.org.uk>
On Tue Nov 10, 2026 at 5:05 PM UTC, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the bpf-next tree got a conflict in:
>
> kernel/bpf/cfg.c
>
> between commit:
>
> 0af298e62e5cf ("treewide: refresh kmalloc_obj() conversions")
>
> from the origin tree and commit:
>
> 6771f70a47332 ("bpf: Remove is_state_visited(), bpf_compute_scc() and iter.depth")
>
> from the bpf-next tree.
Thanks. It's resolved now.
next prev parent reply other threads:[~2026-11-14 19:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-10 17:05 linux-next: manual merge of the bpf-next tree with the origin tree Mark Brown
2026-11-14 19:36 ` Alexei Starovoitov [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-11-12 14:19 Mark Brown
2026-04-14 12:18 Mark Brown
2026-04-14 14:09 ` Alexei Starovoitov
2026-04-14 14:38 ` Mark Brown
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=DMV6Q8SFLQ72.2AIN7VRB1JJOW@gmail.com \
--to=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=broonie@kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=kees+treewide@kernel.org \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=memxor@gmail.com \
--cc=netdev@vger.kernel.org \
/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