Re: linux-next: manual merge of the bpf-next tree with the origin tree

From: Alexei Starovoitov

Date: Sat Nov 14 2026 - 14:36:34 EST


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.