summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2022-12-13 09:24:49 +0100
committerPaolo Abeni <pabeni@redhat.com>2022-12-13 09:49:29 +0100
commitb11919e1bb7f6f6273f5a33947b8496da2769eb8 (patch)
treef2ff877b9b0363f8fc97f1c94316f763904ec41f /MAINTAINERS
parentnet: lan966x: Remove a useless test in lan966x_ptp_add_trap() (diff)
parentnet: dsa: tag_8021q: avoid leaking ctx on dsa_tag_8021q_register() error path (diff)
downloadlinux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.tar.xz
linux-b11919e1bb7f6f6273f5a33947b8496da2769eb8.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the left-over fixes before the net-next pull-request. net/mptcp/subflow.c d3295fee3c75 ("mptcp: use proper req destructor for IPv6") 36b122baf6a8 ("mptcp: add subflow_v(4,6)_send_synack()") Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 32dd41574930..77aa03cebd02 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8188,7 +8188,10 @@ S: Maintained
F: drivers/i2c/busses/i2c-cpm.c
FREESCALE IMX / MXC FEC DRIVER
-M: Joakim Zhang <qiangqing.zhang@nxp.com>
+M: Wei Fang <wei.fang@nxp.com>
+R: Shenwei Wang <shenwei.wang@nxp.com>
+R: Clark Wang <xiaoning.wang@nxp.com>
+R: NXP Linux Team <linux-imx@nxp.com>
L: netdev@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/net/fsl,fec.yaml