Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf bpf-6.14-rc4
authorAlexei Starovoitov <ast@kernel.org>
Fri, 21 Feb 2025 02:10:24 +0000 (18:10 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 21 Feb 2025 02:13:57 +0000 (18:13 -0800)
commitbd4319b6c2b36aa5c6534aec1dbe16921ec960ef
treeaec6748a7c59ea9a3ebb2c543b2e7f0ce2806b91
parent7042882abc04c720ea798198981943502f4221fe
parent319fc77f8f45a1b3dba15b0cc1a869778fd222f7
Merge git://git./linux/kernel/git/bpf/bpf bpf-6.14-rc4

Cross-merge bpf fixes after downstream PR (bpf-6.14-rc4).

Minor conflict:
  kernel/bpf/btf.c
Adjacent changes:
  kernel/bpf/arena.c
  kernel/bpf/btf.c
  kernel/bpf/syscall.c
  kernel/bpf/verifier.c
  mm/memory.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/arena.c
kernel/bpf/btf.c
kernel/bpf/syscall.c
kernel/bpf/verifier.c
mm/memory.c