diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2022-12-12 13:04:54 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-12-12 13:04:54 -0800 |
| commit | 84698dad0641ffdb7273f3b31664ce32a2e1386c (patch) | |
| tree | 7f8b842404d04366146768be0e4777c664a3a23b | |
| parent | ntb_netdev: Use dev_kfree_skb_any() in interrupt context (diff) | |
| parent | dt-bindings: FEC/i.MX DWMAC and INTMUX maintainer (diff) | |
| download | wireguard-linux-84698dad0641ffdb7273f3b31664ce32a2e1386c.tar.xz wireguard-linux-84698dad0641ffdb7273f3b31664ce32a2e1386c.zip | |
Merge branch 'update-joakim-zhang-entries'
Florian Fainelli says:
====================
Update Joakim Zhang entries
Shawn, since you are the i.MX maintainer I added you and the NXP Linux
Team as the de-facto maintainers for those entries, however there may be
other people to list, thanks!
====================
Link: https://lore.kernel.org/r/20221209220519.1542872-1-f.fainelli@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml | 3 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/fsl,fec.yaml | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 | ||||
| -rw-r--r-- | MAINTAINERS | 5 |
4 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml b/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml index 1d6e0f64a807..985bfa4f6fda 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml +++ b/Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml @@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Freescale INTMUX interrupt multiplexer maintainers: - - Joakim Zhang <qiangqing.zhang@nxp.com> + - Shawn Guo <shawnguo@kernel.org> + - NXP Linux Team <linux-imx@nxp.com> properties: compatible: diff --git a/Documentation/devicetree/bindings/net/fsl,fec.yaml b/Documentation/devicetree/bindings/net/fsl,fec.yaml index e0f376f7e274..77e5f32cb62f 100644 --- a/Documentation/devicetree/bindings/net/fsl,fec.yaml +++ b/Documentation/devicetree/bindings/net/fsl,fec.yaml @@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Freescale Fast Ethernet Controller (FEC) maintainers: - - Joakim Zhang <qiangqing.zhang@nxp.com> + - Shawn Guo <shawnguo@kernel.org> + - Wei Fang <wei.fang@nxp.com> + - NXP Linux Team <linux-imx@nxp.com> allOf: - $ref: ethernet-controller.yaml# diff --git a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml index 4c155441acbf..1857cb4b7139 100644 --- a/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml +++ b/Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml @@ -7,7 +7,9 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: NXP i.MX8 DWMAC glue layer maintainers: - - Joakim Zhang <qiangqing.zhang@nxp.com> + - Clark Wang <xiaoning.wang@nxp.com> + - Shawn Guo <shawnguo@kernel.org> + - NXP Linux Team <linux-imx@nxp.com> # We need a select here so we don't match all nodes with 'snps,dwmac' select: diff --git a/MAINTAINERS b/MAINTAINERS index 1daadaa4d48b..78d8928741ed 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8183,7 +8183,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 |