git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commit

author	Alexei Starovoitov <ast@kernel.org>
	Fri, 3 Apr 2026 15:12:58 +0000 (08:12 -0700)
committer	Alexei Starovoitov <ast@kernel.org>
	Fri, 3 Apr 2026 15:14:13 +0000 (08:14 -0700)
commit	891a05ccba927050cee17eb90c74692fe083ddaf
tree	0ca1e1ee18f52cfe550898a7b78ae3839d73e8bd	tree \| snapshot
parent	6f6c794d0ff05dab1fa4677f39043de8a6a80da3	commit \| diff
parent	d8a9a4b11a137909e306e50346148fc5c3b63f9d	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf 7.0-rc6+

Cross-merge BPF and other fixes after downstream PR.

Minor conflict in kernel/bpf/verifier.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
kernel/bpf/syscall.c	diff1 \|	diff2 \|	blob \| history
kernel/bpf/verifier.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history