Netdev List
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: 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: Christian Brauner <brauner@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Sergei Nizovtsev <snizovtsev@cloudlinux.com>
Subject: linux-next: manual merge of the bpf tree with the origin tree
Date: Mon, 16 Nov 2026 15:22:12 +0000	[thread overview]
Message-ID: <avsfpHqbu_rdmOrf@sirena.org.uk> (raw)

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

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)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply	other threads:[~2026-11-16 15:22 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=avsfpHqbu_rdmOrf@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=brauner@kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=eddyz87@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=memxor@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=snizovtsev@cloudlinux.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