netdev - Re: linux-next: manual merge of the bpf-next tree with the vfs-brauner tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAADnVQLo4-jSRh5J=tNeEnN_3Rsxy0zOGccYdfqe934+jteVjA@mail.gmail.com>
Date: Thu, 26 Jun 2025 19:17:25 -0700
From: Alexei Starovoitov <alexei.starovoitov@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Daniel Borkmann <daniel@...earbox.net>, Alexei Starovoitov <ast@...nel.org>, 
	Andrii Nakryiko <andrii@...nel.org>, Christian Brauner <brauner@...nel.org>, bpf <bpf@...r.kernel.org>, 
	Networking <netdev@...r.kernel.org>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Song Liu <song@...nel.org>, 
	Viktor Malik <vmalik@...hat.com>
Subject: Re: linux-next: manual merge of the bpf-next tree with the
 vfs-brauner tree

On Thu, Jun 26, 2025 at 7:12 PM Stephen Rothwell <sfr@...b.auug.org.au> 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.