]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge branch 'vfs-6.17.bpf' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs
authorAlexei Starovoitov <ast@kernel.org>
Fri, 27 Jun 2025 01:59:07 +0000 (18:59 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 27 Jun 2025 02:01:04 +0000 (19:01 -0700)
commit48d998af99f9e78ac8a8e405c50a7af64a5325a6
treebbd59da07f7b3ad54addb16b6c47c7c854c9c022
parent6def0822d211df4bfb3276eac42f541dc9cc9fb8
parent13b0cce9e294f8ddf228b9db3e01d76ac29872f2
Merge branch 'vfs-6.17.bpf' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

Merge branch 'vfs-6.17.bpf' from vfs tree into bpf-next/master
and resolve conflicts.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/helpers.c
kernel/bpf/verifier.c