[PATCH bpf-next] bpf: MAINTAINERS: Update bpf maintainers

From: Martin KaFai Lau <martin.lau@kernel.org>

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>
---
 MAINTAINERS | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index dfc621ff629d..d9caa2d980f1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS

@@ -4766,13 +4766,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>

@@ -4905,18 +4898,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

@@ -4951,14 +4937,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

-- 
2.53.0-Meta

On 5/29/26 10:39 PM, Martin KaFai Lau wrote:

From: Martin KaFai Lau <martin.lau@kernel.org>

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>

Thanks a ton for all the hard work over the years, Martin! We
hope to see you around, enjoy the break! :-)

Acked-by: Daniel Borkmann <daniel@iogearbox.net>

On Sat, May 30, 2026 at 4:40 AM Martin KaFai Lau [off-list ref] wrote:

From: Martin KaFai Lau <martin.lau@kernel.org>

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.

Thanks Martin for your great effort! I always appreciate your awesome
involvement in BPF timestamping!

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]".

Maybe it's not an appropriate timing to ask this, but considering the
further development I really want to know if you'll continue with the
latest series around struct_ops? Or you will delegate someone to take
over your work?

Thanks,
Jason

On Sat, May 30, 2026 at 09:35:47AM +0800, Jason Xing wrote:

Maybe it's not an appropriate timing to ask this, but considering the
further development I really want to know if you'll continue with the
latest series around struct_ops? Or you will delegate someone to take
over your work?

It had already been discussed in another thread [1] that you were involved
and cc'd. In short, Amery will respin it.

[1] https://patchwork.kernel.org/project/netdevbpf/patch/20260523083001.2911931-4-kuniyu@google.com/#26971716

On Sat, May 30, 2026 at 10:57 AM Martin KaFai Lau [off-list ref] wrote:

On Sat, May 30, 2026 at 09:35:47AM +0800, Jason Xing wrote:

quoted

Maybe it's not an appropriate timing to ask this, but considering the
further development I really want to know if you'll continue with the
latest series around struct_ops? Or you will delegate someone to take
over your work?

It had already been discussed in another thread [1] that you were involved
and cc'd. In short, Amery will respin it.

[1] https://patchwork.kernel.org/project/netdevbpf/patch/20260523083001.2911931-4-kuniyu@google.com/#26971716

Ah, I didn't realize that at that point... Thanks.

Thanks,
Jason

On 5/30/26 4:39 AM, Martin KaFai Lau wrote:

From: Martin KaFai Lau<martin.lau@kernel.org>

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!

Thank you Martin, and best wishes for your long break.

I really appreciate all your guidance and help over the years.

My first kernel commit was guided by you, and I am still very grateful 
for that.

Thanks again, and take care!

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov [off-list ref]:

On Fri, 29 May 2026 13:39:09 -0700 you wrote:

From: Martin KaFai Lau <martin.lau@kernel.org>

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]".

[...]

Here is the summary with links:
  - [bpf-next] bpf: MAINTAINERS: Update bpf maintainers
    https://git.kernel.org/bpf/bpf-next/c/7c7c42d606ed

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html