Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) Include fixes for netrom and dsa (Fabian Frederick and Florian Fainelli) 2) Fix FIXED_PHY support in stmmac, from Giuseppe CAVALLARO. 3) Several SKB use after free fixes (vxlan, openvswitch, vxlan, ip_tunnel, fou), from Li ROngQing. 4) fec driver PTP support fixes from Luwei Zhou and Nimrod Andy. 5) Use after free in virtio_net, from Michael S Tsirkin. 6) Fix flow mask handling for megaflows in openvswitch, from Pravin B Shelar. 7) ISDN gigaset and capi bug fixes from Tilman Schmidt. 8) Fix route leak in ip_send_unicast_reply(), from Vasily Averin. 9) Fix two eBPF JIT bugs on x86, from Alexei Starovoitov. 10) TCP_SKB_CB() reorganization caused a few regressions, fixed by Cong Wang and Eric Dumazet. 11) Don't overwrite end of SKB when parsing malformed sctp ASCONF chunks, from Daniel Borkmann. 12) Don't call sock_kfree_s() with NULL pointers, this function also has the side effect of adjusting the socket memory usage. From Cong Wang. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (90 commits) bna: fix skb->truesize underestimation net: dsa: add includes for ethtool and phy_fixed definitions openvswitch: Set flow-key members. netrom: use linux/uaccess.h dsa: Fix conversion from host device to mii bus tipc: fix bug in bundled buffer reception ipv6: introduce tcp_v6_iif() sfc: add support for skb->xmit_more r8152: return -EBUSY for runtime suspend ipv4: fix a potential use after free in fou.c ipv4: fix a potential use after free in ip_tunnel_core.c hyperv: Add handling of IP header with option field in netvsc_set_hash() openvswitch: Create right mask with disabled megaflows vxlan: fix a free after use openvswitch: fix a use after free ipv4: dst_entry leak in ip_send_unicast_reply() ipv4: clean up cookie_v4_check() ipv4: share tcp_v4_save_options() with cookie_v4_check() ipv4: call __ip_options_echo() in cookie_v4_check() atm: simplify lanai.c by using module_pci_driver ...
Showing
- Documentation/devicetree/bindings/net/sti-dwmac.txt 49 additions, 42 deletionsDocumentation/devicetree/bindings/net/sti-dwmac.txt
- MAINTAINERS 1 addition, 1 deletionMAINTAINERS
- arch/arm64/boot/dts/apm-mustang.dts 4 additions, 0 deletionsarch/arm64/boot/dts/apm-mustang.dts
- arch/arm64/boot/dts/apm-storm.dtsi 24 additions, 0 deletionsarch/arm64/boot/dts/apm-storm.dtsi
- arch/x86/net/bpf_jit_comp.c 19 additions, 6 deletionsarch/x86/net/bpf_jit_comp.c
- drivers/atm/lanai.c 1 addition, 21 deletionsdrivers/atm/lanai.c
- drivers/isdn/capi/capidrv.c 20 additions, 4 deletionsdrivers/isdn/capi/capidrv.c
- drivers/isdn/capi/capiutil.c 34 additions, 7 deletionsdrivers/isdn/capi/capiutil.c
- drivers/isdn/capi/kcapi.c 2 additions, 2 deletionsdrivers/isdn/capi/kcapi.c
- drivers/isdn/gigaset/capi.c 130 additions, 25 deletionsdrivers/isdn/gigaset/capi.c
- drivers/isdn/gigaset/ev-layer.c 75 additions, 41 deletionsdrivers/isdn/gigaset/ev-layer.c
- drivers/isdn/gigaset/usb-gigaset.c 3 additions, 1 deletiondrivers/isdn/gigaset/usb-gigaset.c
- drivers/net/dsa/mv88e6060.c 12 additions, 4 deletionsdrivers/net/dsa/mv88e6060.c
- drivers/net/dsa/mv88e6171.c 1 addition, 1 deletiondrivers/net/dsa/mv88e6171.c
- drivers/net/dsa/mv88e6xxx.c 10 additions, 4 deletionsdrivers/net/dsa/mv88e6xxx.c
- drivers/net/ethernet/apm/xgene/Makefile 1 addition, 1 deletiondrivers/net/ethernet/apm/xgene/Makefile
- drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c 17 additions, 8 deletionsdrivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c 0 additions, 1 deletiondrivers/net/ethernet/apm/xgene/xgene_enet_hw.c
- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h 3 additions, 1 deletiondrivers/net/ethernet/apm/xgene/xgene_enet_hw.h
- drivers/net/ethernet/apm/xgene/xgene_enet_main.c 14 additions, 4 deletionsdrivers/net/ethernet/apm/xgene/xgene_enet_main.c
Loading
Please register or sign in to comment