linux-next: manual merge of the bpf tree with the origin tree
Subsystems (5)
Mark Brown
maintainerHi 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.
kernel/bpf/bpf_lsm.c +0 -0
@@@ -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)
Quoted 28 lines · Mark Brown
Hi all,
Today's linux-next merge of the bpf tree got a conflict in:
kernel/bpf/bpf_lsm.cbetween commit:
ea8c4b37b8809("bpf: don't marknamespace_initandnamespace_freearguments 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.
kernel/bpf/bpf_lsm.c +0
-0
kernel/bpf/bpf_lsm.c
Quoted 10 lines
kernel/bpf/bpf_lsm.c +2
-0@@@ -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.