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

From: Alexei Starovoitov

Date: Mon Nov 16 2026 - 11:03:52 EST


On Mon, Nov 16, 2026 at 07:22 AM Mark Brown <broonie@xxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the bpf tree got a conflict in:
>
> kernel/bpf/bpf_lsm.c
>
> between commit:
>
> ea8c4b37b8809 ("bpf: don't mark namespace_init and namespace_free arguments as trusted")
>
> from the origin tree and commit:
>
> ab86b62012b9e ("bpf, lsm: Mark backing_file_alloc/free LSM hooks as untrusted")
>
> from the bpf tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc kernel/bpf/bpf_lsm.c
> index 468e63dbd922d,f39a3766f2245..0000000000000
> --- a/kernel/bpf/bpf_lsm.c
> +++ b/kernel/bpf/bpf_lsm.c
> @@@ -411,8 -411,8 +411,10 @@@ BTF_ID(func, bpf_lsm_bpf_map_free
> BTF_ID(func, bpf_lsm_bpf_prog_free)
> BTF_ID(func, bpf_lsm_file_alloc_security)
> BTF_ID(func, bpf_lsm_file_free_security)
> +BTF_ID(func, bpf_lsm_namespace_init)
> +BTF_ID(func, bpf_lsm_namespace_free)
> + BTF_ID(func, bpf_lsm_backing_file_alloc)
> + BTF_ID(func, bpf_lsm_backing_file_free)
> #ifdef CONFIG_SECURITY_NETWORK
> BTF_ID(func, bpf_lsm_sk_alloc_security)
> BTF_ID(func, bpf_lsm_sk_free_security)

Thanks. The resolution is correct.