Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d18b4d62cc21b96f4e0bba0ba4b17c50af167b72..72dfb80e87216498fecfa30e60e21920f3ee388f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2794,10 +2794,13 @@ M:      Simon Wunderlich <sw@simonwunderlich.de>
 M:     Antonio Quartulli <a@unstable.cc>
 L:     b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)
 W:     https://www.open-mesh.org/
+B:     https://www.open-mesh.org/projects/batman-adv/issues
+C:     irc://chat.freenode.net/batman
 Q:     https://patchwork.open-mesh.org/project/batman/list/
+T:     git https://git.open-mesh.org/linux-merge.git
 S:     Maintained
-F:     Documentation/ABI/testing/sysfs-class-net-batman-adv
-F:     Documentation/ABI/testing/sysfs-class-net-mesh
+F:     Documentation/ABI/obsolete/sysfs-class-net-batman-adv
+F:     Documentation/ABI/obsolete/sysfs-class-net-mesh
 F:     Documentation/networking/batman-adv.rst
 F:     include/uapi/linux/batadv_packet.h
 F:     include/uapi/linux/batman_adv.h
@@ -9876,15 +9879,6 @@ F:       drivers/net/ethernet/mellanox/mlx5/core/accel/*
 F:     drivers/net/ethernet/mellanox/mlx5/core/fpga/*
 F:     include/linux/mlx5/mlx5_ifc_fpga.h
 
-MELLANOX ETHERNET INNOVA IPSEC DRIVER
-R:     Boris Pismenny <borisp@mellanox.com>
-L:     netdev@vger.kernel.org
-S:     Supported
-W:     http://www.mellanox.com
-Q:     http://patchwork.ozlabs.org/project/netdev/list/
-F:     drivers/net/ethernet/mellanox/mlx5/core/en_ipsec/*
-F:     drivers/net/ethernet/mellanox/mlx5/core/ipsec*
-
 MELLANOX ETHERNET SWITCH DRIVERS
 M:     Jiri Pirko <jiri@mellanox.com>
 M:     Ido Schimmel <idosch@mellanox.com>