From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Borkmann <daniel@iogearbox•net>,
Alexei Starovoitov <ast@kernel•org>,
Andrii Nakryiko <andrii@kernel•org>,
Christian Brauner <brauner@kernel•org>
Cc: bpf <bpf@vger•kernel.org>, Networking <netdev@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Song Liu <song@kernel•org>, Viktor Malik <vmalik@redhat•com>
Subject: linux-next: manual merge of the bpf-next tree with the vfs-brauner tree
Date: Fri, 27 Jun 2025 12:12:06 +1000 [thread overview]
Message-ID: <20250627121206.31048e14@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1676 bytes --]
Hi all,
Today's linux-next merge of the bpf-next tree got a conflict in:
kernel/bpf/helpers.c
between commit:
535b070f4a80 ("bpf: Introduce bpf_cgroup_read_xattr to read xattr of cgroup's node")
from the vfs-brauner tree and commit:
e91370550f1f ("bpf: Add kfuncs for read-only string operations")
from the bpf-next 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.
--
Cheers,
Stephen Rothwell
diff --cc kernel/bpf/helpers.c
index 9ff1b4090289,2cdcf7b2c91e..000000000000
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -3397,9 -3768,17 +3768,20 @@@ BTF_ID_FLAGS(func, bpf_iter_dmabuf_next
BTF_ID_FLAGS(func, bpf_iter_dmabuf_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)
#endif
BTF_ID_FLAGS(func, __bpf_trap)
+#ifdef CONFIG_CGROUPS
+BTF_ID_FLAGS(func, bpf_cgroup_read_xattr, KF_RCU)
+#endif
+ BTF_ID_FLAGS(func, bpf_strcmp);
+ BTF_ID_FLAGS(func, bpf_strchr);
+ BTF_ID_FLAGS(func, bpf_strchrnul);
+ BTF_ID_FLAGS(func, bpf_strnchr);
+ BTF_ID_FLAGS(func, bpf_strrchr);
+ BTF_ID_FLAGS(func, bpf_strlen);
+ BTF_ID_FLAGS(func, bpf_strnlen);
+ BTF_ID_FLAGS(func, bpf_strspn);
+ BTF_ID_FLAGS(func, bpf_strcspn);
+ BTF_ID_FLAGS(func, bpf_strstr);
+ BTF_ID_FLAGS(func, bpf_strnstr);
BTF_KFUNCS_END(common_btf_ids)
static const struct btf_kfunc_id_set common_kfunc_set = {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-06-27 2:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-27 2:12 Stephen Rothwell [this message]
2025-06-27 2:17 ` linux-next: manual merge of the bpf-next tree with the vfs-brauner tree Alexei Starovoitov
2025-06-27 7:50 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-06-04 12:59 Mark Brown
2026-06-04 18:14 ` Daniel Borkmann
2024-08-14 0:56 Stephen Rothwell
2024-08-14 1:48 ` Al Viro
2024-09-15 23:42 ` Stephen Rothwell
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=20250627121206.31048e14@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=brauner@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=song@kernel$(echo .)org \
--cc=vmalik@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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