diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 09:59:29 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-05-09 10:01:01 -0700 |
| commit | e7073830cc8b52ef3df7dd150e4dac7706e0e104 (patch) | |
| tree | e257cb163ac414e82acf319ab8cdd98ad4434036 /MAINTAINERS | |
| parent | 628bc3e5a1beae395b5b515998396c60559ed3a9 (diff) | |
| parent | 8c3b7565f81e030ef448378acd1b35dabb493e3b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Adjacent changes:
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
35d92abfbad8 ("net: hns3: fix kernel crash when devlink reload during initialization")
2a1a1a7b5fd7 ("net: hns3: add command queue trace for hns3")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 294e472d7de8..b81b2be60b77 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5717,7 +5717,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ F: drivers/media/dvb-frontends/cxd2820r* CXGB3 ETHERNET DRIVER (CXGB3) -M: Raju Rangoju <rajur@chelsio.com> +M: Potnuri Bharat Teja <bharat@chelsio.com> L: netdev@vger.kernel.org S: Supported W: http://www.chelsio.com @@ -5738,7 +5738,7 @@ W: http://www.chelsio.com F: drivers/crypto/chelsio CXGB4 ETHERNET DRIVER (CXGB4) -M: Raju Rangoju <rajur@chelsio.com> +M: Potnuri Bharat Teja <bharat@chelsio.com> L: netdev@vger.kernel.org S: Supported W: http://www.chelsio.com @@ -5767,7 +5767,7 @@ F: drivers/infiniband/hw/cxgb4/ F: include/uapi/rdma/cxgb4-abi.h CXGB4VF ETHERNET DRIVER (CXGB4VF) -M: Raju Rangoju <rajur@chelsio.com> +M: Potnuri Bharat Teja <bharat@chelsio.com> L: netdev@vger.kernel.org S: Supported W: http://www.chelsio.com |