From: Jakub Kicinski <kuba@kernel.org>
Date: Wed, 2 Aug 2023 18:28:43 +0000 (-0700)
Subject: MAINTAINERS: update TUN/TAP maintainers
X-Git-Tag: Ubuntu-6.5.0-9.9~2082^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0765c5f293357ee43eca72e27c3547f9d99ac355;p=mirror_ubuntu-kernels.git

MAINTAINERS: update TUN/TAP maintainers

Willem and Jason have agreed to take over the maintainer
duties for TUN/TAP, thank you!

There's an existing entry for TUN/TAP which only covers
the user mode Linux implementation.
Since we haven't heard from Maxim on the list for almost
a decade, extend that entry and take it over, rather than
adding a new one.

Acked-by: Willem de Bruijn <willemb@google.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20230802182843.4193099-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/MAINTAINERS b/MAINTAINERS
index 1085dfb35777..8f93c48f6931 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21670,11 +21670,14 @@ S:	Orphan
 F:	drivers/net/ethernet/dec/tulip/
 
 TUN/TAP driver
-M:	Maxim Krasnyansky <maxk@qti.qualcomm.com>
+M:	Willem de Bruijn <willemdebruijn.kernel@gmail.com>
+M:	Jason Wang <jasowang@redhat.com>
 S:	Maintained
 W:	http://vtun.sourceforge.net/tun
 F:	Documentation/networking/tuntap.rst
 F:	arch/um/os-Linux/drivers/
+F:	drivers/net/tap.c
+F:	drivers/net/tun.c
 
 TURBOCHANNEL SUBSYSTEM
 M:	"Maciej W. Rozycki" <macro@orcam.me.uk>