diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-03-26 04:52:22 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-03-26 09:32:10 -0700 |
| commit | 023b1e9d265ca0662111a9df23d22b4632717a8a (patch) | |
| tree | b43291b5490e259ccdcd38e03ef17002cc90c9d8 /MAINTAINERS | |
| parent | 705094f6556d88540e1076e432cbca6b596421dd (diff) | |
| parent | 70facbf978ac90c6da17a3de2a8dd111b06f1bac (diff) | |
| download | ath-023b1e9d265ca0662111a9df23d22b4632717a8a.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.15 net-next PR.
No conflicts, adjacent changes:
drivers/net/ethernet/broadcom/bnxt/bnxt.c
919f9f497dbc ("eth: bnxt: fix out-of-range access of vnic_info array")
fe96d717d38e ("bnxt_en: Extend queue stop/start for TX rings")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c3fce44167234..03f6db69a8ca3 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/ |