bpf: Update bpf maintainers

I am making a life change and will take a long break
from my current work, so I will step down from the "M:" responsibility.

I am currently a "R:" in "BPF [GENERAL]", this part stays unchanged.
I am folding most of the parts into "BPF [GENERAL]".

For "BPF [BTF]", it is long overdue as I am no longer involved.
It is folded into the "BPF [GENERAL]".

The "BPF [STORAGE & CGROUPS]" will also be covered by "BPF [GENERAL]".

For struct_ops, its usage is no longer limited to networking,
so this naturally should move back to "BPF [GENERAL]".

For the reuseport, it will continue to be maintained together
by "BPF [GENERAL]" and the "NETWORKING [SOCKETS]".

For other "BPF [NETWORKING]...", I am moving myself to "R:".

Thanks!

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/r/20260529203909.1222164-1-martin.lau@linux.dev
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 67ef966f77b9d4b8d24b539da60cb26526302f11..afae76600fc6fb3038a2b247a734ad6b5d348e77 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4775,13 +4775,6 @@ S:       Supported
 F:     arch/x86/net/
 X:     arch/x86/net/bpf_jit_comp32.c
 
-BPF [BTF]
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     include/linux/btf*
-F:     kernel/bpf/btf.c
-
 BPF [CORE]
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
@@ -4914,18 +4907,11 @@ F:      tools/testing/selftests/bpf/prog_tests/tc_netkit.c
 F:     tools/testing/selftests/drivers/net/hw/nk_qlease.py
 F:     tools/testing/selftests/net/nk_qlease.py
 
-BPF [NETWORKING] (struct_ops, reuseport)
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/bpf_struct*
-
 BPF [NETWORKING] (tcx & tc BPF, sock_addr)
-M:     Martin KaFai Lau <martin.lau@linux.dev>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 R:     John Fastabend <john.fastabend@gmail.com>
 R:     Stanislav Fomichev <sdf@fomichev.me>
+R:     Martin KaFai Lau <martin.lau@linux.dev>
 L:     bpf@vger.kernel.org
 L:     netdev@vger.kernel.org
 S:     Maintained
@@ -4960,14 +4946,6 @@ L:       bpf@vger.kernel.org
 S:     Maintained
 F:     tools/testing/selftests/bpf/
 
-BPF [STORAGE & CGROUPS]
-M:     Martin KaFai Lau <martin.lau@linux.dev>
-L:     bpf@vger.kernel.org
-S:     Maintained
-F:     kernel/bpf/*storage.c
-F:     kernel/bpf/bpf_lru*
-F:     kernel/bpf/cgroup.c
-
 BPF [TOOLING] (bpftool)
 M:     Quentin Monnet <qmo@kernel.org>
 L:     bpf@vger.kernel.org