Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: "Several networking final fixes and tidies for the merge window: 1) Changes during the merge window unintentionally took away the ability to build bluetooth modular, fix from Geert Uytterhoeven. 2) Several phy_node reference count bug fixes from Uwe Kleine-König. 3) Fix ucc_geth build failures, also from Uwe Kleine-König. 4) Fix klog false positivies when netlink messages go to network taps, by properly resetting the network header. Fix from Daniel Borkmann. 5) Sizing estimate of VF netlink messages is too small, from Jiri Benc. 6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian. 7) VLAN untagging is erroneously dependent upon whether the VLAN module is loaded or not, but there are generic dependencies that matter wrt what can be expected as the SKB enters the stack. Make the basic untagging generic code, and do it unc...
Showing
- Documentation/devicetree/bindings/net/apm-xgene-enet.txt 66 additions, 0 deletionsDocumentation/devicetree/bindings/net/apm-xgene-enet.txt
- Documentation/devicetree/bindings/net/fsl-fec.txt 28 additions, 1 deletionDocumentation/devicetree/bindings/net/fsl-fec.txt
- MAINTAINERS 8 additions, 0 deletionsMAINTAINERS
- arch/arm64/boot/dts/apm-mustang.dts 4 additions, 0 deletionsarch/arm64/boot/dts/apm-mustang.dts
- arch/arm64/boot/dts/apm-storm.dtsi 27 additions, 3 deletionsarch/arm64/boot/dts/apm-storm.dtsi
- drivers/atm/atmtcp.c 1 addition, 0 deletionsdrivers/atm/atmtcp.c
- drivers/atm/solos-pci.c 1 addition, 0 deletionsdrivers/atm/solos-pci.c
- drivers/net/arcnet/com20020_cs.c 8 additions, 8 deletionsdrivers/net/arcnet/com20020_cs.c
- drivers/net/ethernet/8390/Kconfig 2 additions, 1 deletiondrivers/net/ethernet/8390/Kconfig
- drivers/net/ethernet/8390/axnet_cs.c 13 additions, 13 deletionsdrivers/net/ethernet/8390/axnet_cs.c
- drivers/net/ethernet/8390/ne.c 2 additions, 0 deletionsdrivers/net/ethernet/8390/ne.c
- drivers/net/ethernet/8390/pcnet_cs.c 34 additions, 34 deletionsdrivers/net/ethernet/8390/pcnet_cs.c
- drivers/net/ethernet/Kconfig 1 addition, 0 deletionsdrivers/net/ethernet/Kconfig
- drivers/net/ethernet/Makefile 1 addition, 0 deletionsdrivers/net/ethernet/Makefile
- drivers/net/ethernet/amd/xgbe/xgbe-drv.c 0 additions, 1 deletiondrivers/net/ethernet/amd/xgbe/xgbe-drv.c
- drivers/net/ethernet/apm/Kconfig 1 addition, 0 deletionsdrivers/net/ethernet/apm/Kconfig
- drivers/net/ethernet/apm/Makefile 5 additions, 0 deletionsdrivers/net/ethernet/apm/Makefile
- drivers/net/ethernet/apm/xgene/Kconfig 9 additions, 0 deletionsdrivers/net/ethernet/apm/xgene/Kconfig
- drivers/net/ethernet/apm/xgene/Makefile 6 additions, 0 deletionsdrivers/net/ethernet/apm/xgene/Makefile
- drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c 125 additions, 0 deletionsdrivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
Please register or sign in to comment