On Thu, Jun 26, 2025 at 7:12 PM Stephen Rothwell [off-list ref] wrote:

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.

Our emails raced in www :)
A minute ago merged vfs's branch into bpf-next/master,
resolved this conflict and pushed to /master and /for-next.