Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e127c2f..80467c8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10765,7 +10765,6 @@ L7 BPF FRAMEWORK
 M:     John Fastabend <john.fastabend@gmail.com>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 M:     Jakub Sitnicki <jakub@cloudflare.com>
-M:     Lorenz Bauer <lmb@cloudflare.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -13376,6 +13375,7 @@ F:      net/core/drop_monitor.c
 NETWORKING DRIVERS
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Jakub Kicinski <kuba@kernel.org>
+M:     Paolo Abeni <pabeni@redhat.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 Q:     https://patchwork.kernel.org/project/netdevbpf/list/
@@ -13422,6 +13422,7 @@ F:      tools/testing/selftests/drivers/net/dsa/
 NETWORKING [GENERAL]
 M:     "David S. Miller" <davem@davemloft.net>
 M:     Jakub Kicinski <kuba@kernel.org>
+M:     Paolo Abeni <pabeni@redhat.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 Q:     https://patchwork.kernel.org/project/netdevbpf/list/