Commit b11919e1 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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
  d3295fee ("mptcp: use proper req destructor for IPv6")
  36b122ba ("mptcp: add subflow_v(4,6)_send_synack()")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents d1c72286 e0954930

Documentation/devicetree/bindings/interrupt-controller/fsl,intmux.yaml

+2 −1
Original line number Diff line number Diff line
@@ -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:

Documentation/devicetree/bindings/net/fsl,fec.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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#

Documentation/devicetree/bindings/net/nxp,dwmac-imx.yaml

+3 −1
Original line number Diff line number Diff line
@@ -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:

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -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
































drivers/net/dsa/lan9303-core.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -1005,9 +1005,11 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port,







		ret = lan9303_read_switch_port(









			chip, port, lan9303_mib[u].offset, &reg);



















		if (ret)









		if (ret) {









			dev_warn(chip->dev, "Reading status port %d reg %u failed\n",









				 port, lan9303_mib[u].offset);









			reg = 0;









		}









		data[u] = reg;









	}









}