summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS4
2 files changed, 7 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 53d11a46fd69..d71d42c30044 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3233,6 +3233,10 @@ N: Rui Prior
E: rprior@inescn.pt
D: ATM device driver for NICStAR based cards
+N: Roopa Prabhu
+E: roopa@nvidia.com
+D: Bridge co-maintainer, vxlan and networking contributor
+
N: Stefan Probst
E: sp@caldera.de
D: The Linux Support Team Erlangen, 1993-97
diff --git a/MAINTAINERS b/MAINTAINERS
index 00e94bec401e..a0e48e8c7870 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8593,12 +8593,14 @@ F: Documentation/networking/devlink/etas_es58x.rst
F: drivers/net/can/usb/etas_es58x/
ETHERNET BRIDGE
-M: Roopa Prabhu <roopa@nvidia.com>
M: Nikolay Aleksandrov <razor@blackwall.org>
+M: Ido Schimmel <idosch@nvidia.com>
L: bridge@lists.linux.dev
L: netdev@vger.kernel.org
S: Maintained
W: http://www.linuxfoundation.org/en/Net:Bridge
+F: include/linux/if_bridge.h
+F: include/uapi/linux/if_bridge.h
F: include/linux/netfilter_bridge/
F: net/bridge/